diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-10 14:21:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-10 14:21:41 (GMT) |
| commit | 081b51d03c14c553ec99d3905c5b0296311f3ed2 (patch) | |
| tree | 4004cec3a3db27f18d98915f7ac9f72d33fbe281 /generic | |
| parent | cad330bea5eb1c5fa6958b11506b10529846eb00 (diff) | |
| parent | 8d91041a73bf5f80947854d55f3d226494df1e45 (diff) | |
| download | tcl-081b51d03c14c553ec99d3905c5b0296311f3ed2.zip tcl-081b51d03c14c553ec99d3905c5b0296311f3ed2.tar.gz tcl-081b51d03c14c553ec99d3905c5b0296311f3ed2.tar.bz2 | |
On OSX, there is a conflict with the "define panic" and definitions in "mach.h".
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index ded8d0b..eebdc91 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2619,7 +2619,9 @@ 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" */ # define panic Tcl_Panic +#endif # define panicVA Tcl_PanicVA #endif /* !TCL_NO_DEPRECATED */ |