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 | c5e39e03c3b4dfb512994f9c3501601f7ab29150 (patch) | |
| tree | f96b5941ecd9bd98b07fac4499297143945dbd12 /generic/tcl.h | |
| parent | d165a5c00f41522ef47407f4819f0e0e9a2a6df3 (diff) | |
| parent | 8b059d60dc3020deb2ab1d80e27ff78bbd9560cf (diff) | |
| download | tcl-c5e39e03c3b4dfb512994f9c3501601f7ab29150.zip tcl-c5e39e03c3b4dfb512994f9c3501601f7ab29150.tar.gz tcl-c5e39e03c3b4dfb512994f9c3501601f7ab29150.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 |