diff options
| author | dgp <dgp@users.sourceforge.net> | 2016-11-16 15:04:10 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2016-11-16 15:04:10 (GMT) |
| commit | 16483765baae1e041496f1abdd615844ca08dba8 (patch) | |
| tree | da7bc7e3d61ec8cbde015a28bdc6d92fded02a1b /generic/tcl.h | |
| parent | 9b461748a00c4ac031b5c01d99daa9e1b9171f05 (diff) | |
| parent | 0dd529776d4895043aa957a1e7f21d4015733c4e (diff) | |
| download | tcl-16483765baae1e041496f1abdd615844ca08dba8.zip tcl-16483765baae1e041496f1abdd615844ca08dba8.tar.gz tcl-16483765baae1e041496f1abdd615844ca08dba8.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tcl.h')
| -rw-r--r-- | generic/tcl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 4d955d8..00bd9dd 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2623,7 +2623,7 @@ EXTERN void Tcl_GetMemoryInfo(Tcl_DString *dsPtr); # define Tcl_Ckrealloc Tcl_Realloc # define Tcl_Return Tcl_SetResult # define Tcl_TildeSubst Tcl_TranslateFileName -#ifndef MAC_OSX_TCL /* On OSX, there is a conflict with "mach.h" */ +#if !defined(__APPLE__) /* On OSX, there is a conflict with "mach/mach.h" */ # define panic Tcl_Panic #endif # define panicVA Tcl_PanicVA |