summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-03-24 10:59:21 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-03-24 10:59:21 (GMT)
commit53f2161036972c336dd724490722670dbbe1ae5d (patch)
tree37eea9bfef2ce764854eaebeaffa52db943564a8 /macosx
parent3de88fb2b1530760ae576d2359bd44b72ca5ee22 (diff)
parent9ec195cdf50a3f97efb37da5d0d1471529ba138f (diff)
downloadtcl-53f2161036972c336dd724490722670dbbe1ae5d.zip
tcl-53f2161036972c336dd724490722670dbbe1ae5d.tar.gz
tcl-53f2161036972c336dd724490722670dbbe1ae5d.tar.bz2
Merge 8.6. If compiled with -DTCL_NO_DEPRECATED, remove Tcl_MacOSXOpenBundleResources() completely
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tclMacOSXBundle.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/macosx/tclMacOSXBundle.c b/macosx/tclMacOSXBundle.c
index 01b5de4..af15287 100644
--- a/macosx/tclMacOSXBundle.c
+++ b/macosx/tclMacOSXBundle.c
@@ -163,6 +163,8 @@ OpenResourceMap(
*----------------------------------------------------------------------
*/
+#if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9)
+#undef Tcl_MacOSXOpenBundleResources
int
Tcl_MacOSXOpenBundleResources(
Tcl_Interp *interp,
@@ -174,6 +176,7 @@ Tcl_MacOSXOpenBundleResources(
return Tcl_MacOSXOpenVersionedBundleResources(interp, bundleName, NULL,
hasResourceFile, maxPathLen, libraryPath);
}
+#endif
/*
*----------------------------------------------------------------------