summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-10 14:19:28 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-10 14:19:28 (GMT)
commit8d91041a73bf5f80947854d55f3d226494df1e45 (patch)
tree485cb076a6ef69b72e8c37938daa4178829d7442
parent1c9ca6b643b52cbe7a965109dbda2a25c6aa65ff (diff)
downloadtcl-8d91041a73bf5f80947854d55f3d226494df1e45.zip
tcl-8d91041a73bf5f80947854d55f3d226494df1e45.tar.gz
tcl-8d91041a73bf5f80947854d55f3d226494df1e45.tar.bz2
On OSX, there is a conflict with the "define panic" and definitions in "mach.h".
-rw-r--r--generic/tcl.h2
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 */