summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-14 14:20:13 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-14 14:20:13 (GMT)
commita9263ba9069329f5c9f64a6a965cfce12f18ab15 (patch)
tree38503c78ed1f461b250c5c815626e7492db445a6
parentafdcf4fe9ca39a7388f020b9a44fb487547195e7 (diff)
downloadtcl-a9263ba9069329f5c9f64a6a965cfce12f18ab15.zip
tcl-a9263ba9069329f5c9f64a6a965cfce12f18ab15.tar.gz
tcl-a9263ba9069329f5c9f64a6a965cfce12f18ab15.tar.bz2
Better fix for the usability of TCL_NO_DEPRECATED on MacOSX.
-rw-r--r--generic/tcl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 4fb5bb2..f79eb86 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2418,7 +2418,9 @@ EXTERN void Tcl_GetMemoryInfo _ANSI_ARGS_((Tcl_DString *dsPtr));
# define Tcl_Ckrealloc Tcl_Realloc
# define Tcl_Return Tcl_SetResult
# define Tcl_TildeSubst Tcl_TranslateFileName
+#if !defined(__APPLE__) /* On OSX, there is a conflict with "mach/mach.h" */
# define panic Tcl_Panic
+#endif
# define panicVA Tcl_PanicVA
#endif