summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--unix/tclLoadDyld.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b334fd..c56bcf2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
*** 8.4.10 TAGGED FOR RELEASE ***
+ * unix/tclLoadDyld.c: fixed header confilict when building this file
+ with USE_TCL_STUBS.
+
* macosx/Makefile: fixed 'embedded' target.
2005-06-02 Jeff Hobbs <jeffh@ActiveState.com>
diff --git a/unix/tclLoadDyld.c b/unix/tclLoadDyld.c
index 4a42b51..10afad7 100644
--- a/unix/tclLoadDyld.c
+++ b/unix/tclLoadDyld.c
@@ -11,12 +11,13 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclLoadDyld.c,v 1.14.2.2 2005/05/24 04:19:33 das Exp $
+ * RCS: @(#) $Id: tclLoadDyld.c,v 1.14.2.3 2005/06/04 07:05:14 das Exp $
*/
#include "tclInt.h"
#include "tclPort.h"
#include <mach-o/dyld.h>
+#undef panic
#include <mach/mach.h>
typedef struct Tcl_DyldModuleHandle {