summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--generic/tcl.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 15452f3..b5fa2ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-06 Daniel Steffen <das@users.sourceforge.net>
+
+ * generic/tcl.h (Darwin): workaround conflict between deprecated tcl
+ panic macro and panic() function declaration in <mach/mach.h> header.
+
2009-02-05 Don Porter <dgp@users.sourceforge.net>
* generic/tclStringObj.c: Added overflow protections to the
diff --git a/generic/tcl.h b/generic/tcl.h
index ae82114..5f48840 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tcl.h,v 1.153.2.35 2008/04/11 16:57:38 dgp Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.153.2.36 2009/02/06 08:14:55 das Exp $
*/
#ifndef _TCL
@@ -339,6 +339,7 @@ typedef long LONG;
# undef TCL_WIDE_INT_IS_LONG
# endif /* __LP64__ */
# undef HAVE_STRUCT_STAT64
+# include <mach/mach.h>
#endif /* __APPLE__ */
/*