diff options
author | mig <mig> | 2013-02-11 13:50:47 (GMT) |
---|---|---|
committer | mig <mig> | 2013-02-11 13:50:47 (GMT) |
commit | 0055995ec13ad8f27603d140ca19d7858725ef95 (patch) | |
tree | 14f5697a44b71bd7eb3091709c9cac4fe3868025 /generic/tcl.h | |
parent | eb1adf553cfd18472faa6c11b1d46434c15e064f (diff) | |
parent | 30f60173c4738c76675b58db3a7a5aaa62ca79ea (diff) | |
download | tcl-mig_alloc_reform.zip tcl-mig_alloc_reform.tar.gz tcl-mig_alloc_reform.tar.bz2 |
merge trunkmig_alloc_reform
Diffstat (limited to 'generic/tcl.h')
-rw-r--r-- | generic/tcl.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 3003abf..2556a9a 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -472,7 +472,7 @@ typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; struct {long tv_sec;} st_ctim; /* Here is a 4-byte gap */ } Tcl_StatBuf; -#elif defined(HAVE_STRUCT_STAT64) +#elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__) typedef struct stat64 Tcl_StatBuf; #else typedef struct stat Tcl_StatBuf; @@ -2602,13 +2602,6 @@ EXTERN void Tcl_GetMemoryInfo(Tcl_DString *dsPtr); */ #ifndef TCL_NO_DEPRECATED -# undef Tcl_EvalObj -# define Tcl_EvalObj(interp,objPtr) \ - Tcl_EvalObjEx((interp),(objPtr),0) -# undef Tcl_GlobalEvalObj -# define Tcl_GlobalEvalObj(interp,objPtr) \ - Tcl_EvalObjEx((interp),(objPtr),TCL_EVAL_GLOBAL) - /* * These function have been renamed. The old names are deprecated, but we * define these macros for backwards compatibilty. |