diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-10 14:19:28 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-11-10 14:19:28 (GMT) |
commit | 31647bcceb33c217f63d5687c3e12c63fd3bb47e (patch) | |
tree | 485cb076a6ef69b72e8c37938daa4178829d7442 /generic/tcl.h | |
parent | da3723c942a7bfca105f8b2856fdc9b1fd1cf095 (diff) | |
download | tcl-31647bcceb33c217f63d5687c3e12c63fd3bb47e.zip tcl-31647bcceb33c217f63d5687c3e12c63fd3bb47e.tar.gz tcl-31647bcceb33c217f63d5687c3e12c63fd3bb47e.tar.bz2 |
On OSX, there is a conflict with the "define panic" and definitions in "mach.h".
Diffstat (limited to 'generic/tcl.h')
-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 3037ceb..a8ebaed 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2631,7 +2631,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 */ |