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)
commit3f3b063fc15a47c803a2c5d2fb14f719b256dba9 (patch)
tree37eea9bfef2ce764854eaebeaffa52db943564a8 /macosx
parente1c726c81937a898424ddc4efeb08262ccd4755e (diff)
parent6a93c7f3706002c1f0ac2408515c9f87ef9cdeef (diff)
downloadtcl-3f3b063fc15a47c803a2c5d2fb14f719b256dba9.zip
tcl-3f3b063fc15a47c803a2c5d2fb14f719b256dba9.tar.gz
tcl-3f3b063fc15a47c803a2c5d2fb14f719b256dba9.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
/*
*----------------------------------------------------------------------