diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2010-04-04 11:59:22 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2010-04-04 11:59:22 (GMT) |
| commit | e153b47292aeb4f64d8272684422c487e06d125d (patch) | |
| tree | e0da4148eb91a29b39901cdfac0b8d8170c23195 | |
| parent | 7b740a30c4476bd267eae2adfa261599303a9651 (diff) | |
| download | tcl-e153b47292aeb4f64d8272684422c487e06d125d.zip tcl-e153b47292aeb4f64d8272684422c487e06d125d.tar.gz tcl-e153b47292aeb4f64d8272684422c487e06d125d.tar.bz2 | |
* macosx/tclMacOSXBundle.c (OpenResourceMap): [Bug 2981528]: Only
define this function when HAVE_COREFOUNDATION is defined.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | macosx/tclMacOSXBundle.c | 15 |
2 files changed, 17 insertions, 5 deletions
@@ -1,8 +1,13 @@ +2010-04-04 Donal K. Fellows <dkf@users.sf.net> + + * macosx/tclMacOSXBundle.c (OpenResourceMap): [Bug 2981528]: Only + define this function when HAVE_COREFOUNDATION is defined. + 2010-04-02 Jan Nijtmans <nijtmans@users.sf.net> * generic/tcl.decls (Tcl_LoadFile): Add missing "const" in signature, * generic/tclIOUtil.c (Tcl_LoadFile): and some formatting fixes - * generic/tclDecls.h (regenerated) + * generic/tclDecls.h: (regenerated) 2010-04-02 Donal K. Fellows <dkf@users.sf.net> diff --git a/macosx/tclMacOSXBundle.c b/macosx/tclMacOSXBundle.c index 1748ee3..d7153fa 100644 --- a/macosx/tclMacOSXBundle.c +++ b/macosx/tclMacOSXBundle.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclMacOSXBundle.c,v 1.17 2010/03/25 14:02:11 dkf Exp $ + * RCS: @(#) $Id: tclMacOSXBundle.c,v 1.18 2010/04/04 11:59:23 dkf Exp $ */ #include "tclPort.h" @@ -72,13 +72,13 @@ MODULE_SCOPE long tclMacOSXDarwinRelease; #define TclLoadDbgMsg(m, ...) #endif /* TCL_DEBUG_LOAD */ -#endif /* HAVE_COREFOUNDATION */ - /* * Forward declaration of functions defined in this file: */ static short OpenResourceMap(CFBundleRef bundleRef); + +#endif /* HAVE_COREFOUNDATION */ /* *---------------------------------------------------------------------- @@ -93,6 +93,8 @@ static short OpenResourceMap(CFBundleRef bundleRef); *---------------------------------------------------------------------- */ +#ifdef HAVE_COREFOUNDATION + static short OpenResourceMap( CFBundleRef bundleRef) @@ -139,6 +141,8 @@ OpenResourceMap( } return -1; } + +#endif /* HAVE_COREFOUNDATION */ /* *---------------------------------------------------------------------- @@ -282,7 +286,10 @@ Tcl_MacOSXOpenVersionedBundleResources( } if (versionedBundleRef) { #if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 - /* Workaround CFBundle bug in Tiger and earlier. [Bug 2569449] */ + /* + * Workaround CFBundle bug in Tiger and earlier. [Bug 2569449] + */ + if (tclMacOSXDarwinRelease >= 9) #endif { |