summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2006-08-21 03:50:50 (GMT)
committerdas <das>2006-08-21 03:50:50 (GMT)
commit6e7117e439b8f95893db943499a84c6f32996451 (patch)
tree720b2405851b55ac3652e7da2a853eb7bf64199a
parent95662eadb620da590767f0c6731d5d5024d77d14 (diff)
downloadtcl-6e7117e439b8f95893db943499a84c6f32996451.zip
tcl-6e7117e439b8f95893db943499a84c6f32996451.tar.gz
tcl-6e7117e439b8f95893db943499a84c6f32996451.tar.bz2
add support for building without -fconstant-cfstrings, e.g. when MACOSX_DEPLOYMENT_TARGET unset. [Bug 1543715]
-rw-r--r--macosx/tclMacOSXNotify.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c
index 73b1c92..23b858b 100644
--- a/macosx/tclMacOSXNotify.c
+++ b/macosx/tclMacOSXNotify.c
@@ -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: tclMacOSXNotify.c,v 1.10 2006/08/21 01:08:03 das Exp $
+ * RCS: @(#) $Id: tclMacOSXNotify.c,v 1.11 2006/08/21 03:50:50 das Exp $
*/
#include "tclInt.h"
@@ -241,8 +241,14 @@ static pthread_t notifierThread;
* notifier thread.
*/
-static const CFStringRef tclEventsOnlyRunLoopMode =
- CFSTR("com.tcltk.tclEventsOnlyRunLoopMode");
+#ifndef TCL_EVENTS_ONLY_RUN_LOOP_MODE
+#define TCL_EVENTS_ONLY_RUN_LOOP_MODE "com.tcltk.tclEventsOnlyRunLoopMode"
+#endif
+#ifdef __CONSTANT_CFSTRINGS__
+#define tclEventsOnlyRunLoopMode CFSTR(TCL_EVENTS_ONLY_RUN_LOOP_MODE)
+#else
+static CFStringRef tclEventsOnlyRunLoopMode = NULL;
+#endif
/*
* Static routines defined in this file.
@@ -296,6 +302,12 @@ Tcl_InitNotifier(void)
}
#endif
+#ifndef __CONSTANT_CFSTRINGS__
+ if (!tclEventsOnlyRunLoopMode) {
+ tclEventsOnlyRunLoopMode = CFSTR(TCL_EVENTS_ONLY_RUN_LOOP_MODE);
+ }
+#endif
+
/*
* Initialize CFRunLoopSource and add it to CFRunLoop of this thread.
*/