From 281500f39ea00f49bce3fd08e71e69b440482c21 Mon Sep 17 00:00:00 2001
From: das <das>
Date: Tue, 20 Jul 2004 05:40:57 +0000
Subject: 	* macosx/tclMacOSXBundle.c: dynamically acquire address for 
 CFBundleOpenBundleResourceMap symbol, since it is only present in 	full
 CoreFoundation on Mac OS X and not in CFLite on pure Darwin.

---
 ChangeLog                |  6 ++++++
 macosx/tclMacOSXBundle.c | 22 ++++++++++++++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c1bdac8..30a5964 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-07-20  Daniel Steffen  <das@users.sourceforge.net>
+
+	* macosx/tclMacOSXBundle.c: dynamically acquire address for
+	CFBundleOpenBundleResourceMap symbol, since it is only present in
+	full CoreFoundation on Mac OS X and not in CFLite on pure Darwin.
+
 2004-07-19  Zoran Vasiljevic <vasiljevic@users.sf.net>
 
 	* win/tclwinThrd.c: redefined MASTER_LOCK to call 
diff --git a/macosx/tclMacOSXBundle.c b/macosx/tclMacOSXBundle.c
index 5018aa8..8d50494 100644
--- a/macosx/tclMacOSXBundle.c
+++ b/macosx/tclMacOSXBundle.c
@@ -52,6 +52,7 @@
  */
 
 #include <CoreFoundation/CoreFoundation.h>
+#include <mach-o/dyld.h>
 #include "tcl.h"
 
 /*
@@ -167,8 +168,25 @@ Tcl_MacOSXOpenVersionedBundleResources(
 
     if (bundleRef) {	
 	if (hasResourceFile) {
-	    short refNum;
-	    refNum = CFBundleOpenBundleResourceMap(bundleRef);
+	    /* Dynamically acquire address for CFBundleOpenBundleResourceMap
+	     * symbol, since it is only present in full CoreFoundation
+	     * on Mac OS X and not in CFLite on pure Darwin. */
+	    static int initialized = FALSE;
+	    static short (*openresourcemap)(CFBundleRef) = NULL;
+	    if(!initialized) {
+		NSSymbol nsSymbol = NULL;
+		if(NSIsSymbolNameDefinedWithHint("_CFBundleOpenBundleResourceMap", "CoreFoundation")) {
+		    nsSymbol = NSLookupAndBindSymbolWithHint("_CFBundleOpenBundleResourceMap", "CoreFoundation");
+		    if(nsSymbol) {
+			openresourcemap = NSAddressOfSymbol(nsSymbol);
+		    }
+		}
+		initialized = TRUE;
+	    }
+	    if (openresourcemap) {
+		short refNum;
+		refNum = openresourcemap(bundleRef);
+	    }
 	}
 
 	libURL = CFBundleCopyResourceURL(bundleRef,
-- 
cgit v0.12