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 | 6497c6c6ee29a81cf3be60da88104a6398c9878c (patch) | |
| tree | 4004cec3a3db27f18d98915f7ac9f72d33fbe281 | |
| parent | 3555752d45183e123a7bc2a5e8695e243bcb9d77 (diff) | |
| parent | 31647bcceb33c217f63d5687c3e12c63fd3bb47e (diff) | |
| download | tcl-6497c6c6ee29a81cf3be60da88104a6398c9878c.zip tcl-6497c6c6ee29a81cf3be60da88104a6398c9878c.tar.gz tcl-6497c6c6ee29a81cf3be60da88104a6398c9878c.tar.bz2 | |
On OSX, there is a conflict with the "define panic" and definitions in "mach.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 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 */ |