diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-14 14:26:38 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-14 14:26:38 (GMT) |
| commit | 7cdd87e4f1acfd4605512f4b40ffb8b22034b314 (patch) | |
| tree | f96b5941ecd9bd98b07fac4499297143945dbd12 /generic/tcl.h | |
| parent | 6e380ef6e9e2b4ccb24ded37f350f5dfcde61e50 (diff) | |
| parent | 0b9cb76206d26d688f118412400176d30e786785 (diff) | |
| download | tcl-7cdd87e4f1acfd4605512f4b40ffb8b22034b314.zip tcl-7cdd87e4f1acfd4605512f4b40ffb8b22034b314.tar.gz tcl-7cdd87e4f1acfd4605512f4b40ffb8b22034b314.tar.bz2 | |
Merge core-8-6-branch
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 eebdc91..eb53c70 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2619,7 +2619,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 |