diff options
| author | das <das> | 2005-05-14 20:52:30 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-14 20:52:30 (GMT) |
| commit | d4a02e1cab53b49356ecd23754c456774b69ad72 (patch) | |
| tree | 5bd963b54e43eebbac431fc6523841b4b3eed7a3 /macosx/tclMacOSXBundle.c | |
| parent | 3a779d30a2783593c641937509230cb25570e3d8 (diff) | |
| download | tcl-d4a02e1cab53b49356ecd23754c456774b69ad72.zip tcl-d4a02e1cab53b49356ecd23754c456774b69ad72.tar.gz tcl-d4a02e1cab53b49356ecd23754c456774b69ad72.tar.bz2 | |
* macosx/tclMacOSXBundle.c:
* unix/tclUnixInit.c:
* unix/tcl.m4 (Darwin): made use of CoreFoundation API configurable
and added test of CoreFoundation availablility to allow building on
ppc64, replaced HAVE_CFBUNDLE by HAVE_COREFOUNDATION; test for
availability of Tiger or later OSSpinLockLock API.
* unix/tclUnixNotfy.c:
* unix/Makefile.in:
* macosx/tclMacOSXNotify.c (new file): when CoreFoundation is
available, use new CFRunLoop based notifier: allows easy integration
with other event loops on Mac OS X, in particular the TkAqua Carbon
event loop is now integrated via a standard tcl event source (instead
of TkAqua upon loading having to finalize the exsting notifier and
replace it with its custom version). [Patch 1202052]
* tests/unixNotfy.test: don't run unthreaded tests on Darwin
since notifier may be using threads even in unthreaded core.
* unix/tclUnixPort.h:
* unix/tcl.m4 (Darwin): test for thread-unsafe realpath durning
configure, as Darwin 7 and later realpath is threadsafe.
* macosx/tclMacOSXBundle.c:
* unix/tclLoadDyld.c:
* unix/tclUnixInit.c: fixed gcc 4.0 warnings.
* unix/configure: autoconf-2.13
Diffstat (limited to 'macosx/tclMacOSXBundle.c')
| -rw-r--r-- | macosx/tclMacOSXBundle.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/macosx/tclMacOSXBundle.c b/macosx/tclMacOSXBundle.c index 8d50494..75b871c 100644 --- a/macosx/tclMacOSXBundle.c +++ b/macosx/tclMacOSXBundle.c @@ -51,8 +51,11 @@ * license. */ +#ifdef HAVE_COREFOUNDATION #include <CoreFoundation/CoreFoundation.h> #include <mach-o/dyld.h> +#endif /* HAVE_COREFOUNDATION */ + #include "tcl.h" /* @@ -119,6 +122,7 @@ Tcl_MacOSXOpenVersionedBundleResources( int maxPathLen, char *libraryPath) { +#ifdef HAVE_COREFOUNDATION CFBundleRef bundleRef; CFStringRef bundleNameRef; CFURLRef libURL; @@ -199,7 +203,7 @@ Tcl_MacOSXOpenVersionedBundleResources( */ CFURLGetFileSystemRepresentation(libURL, TRUE, - libraryPath, maxPathLen); + (unsigned char*) libraryPath, maxPathLen); CFRelease(libURL); } } @@ -209,4 +213,7 @@ Tcl_MacOSXOpenVersionedBundleResources( } else { return TCL_ERROR; } +#else /* HAVE_COREFOUNDATION */ + return TCL_ERROR; +#endif /* HAVE_COREFOUNDATION */ } |