From 7f59561b49bb2b051b7c1693368a9ac19b545b11 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 10 Nov 2016 14:19:28 +0000 Subject: On OSX, there is a conflict with the "define panic" and definitions in "mach.h". FossilOrigin-Name: 3544f1674ac89f393a5c17f4c2bd3f33557449f1 --- generic/tcl.h | 2 ++ 1 file changed, 2 insertions(+) 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 */ -- cgit v0.12