summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixInit.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2020-03-09 16:34:46 (GMT)
committerdgp <dgp@users.sourceforge.net>2020-03-09 16:34:46 (GMT)
commitf336629f658f0862b12cd860a4edae8b95449eb2 (patch)
treee38704da3f3289f90c91833bf10a8e91a3699088 /unix/tclUnixInit.c
parent254b4fa35fd51a8b78906d5d481f4e1c3901f8b2 (diff)
parent065483ce8b22e7da470427493d68f36e6a53b80b (diff)
downloadtcl-f336629f658f0862b12cd860a4edae8b95449eb2.zip
tcl-f336629f658f0862b12cd860a4edae8b95449eb2.tar.gz
tcl-f336629f658f0862b12cd860a4edae8b95449eb2.tar.bz2
merge 8.7
Diffstat (limited to 'unix/tclUnixInit.c')
-rw-r--r--unix/tclUnixInit.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c
index b37d4ad..137747f 100644
--- a/unix/tclUnixInit.c
+++ b/unix/tclUnixInit.c
@@ -1052,26 +1052,27 @@ TclpFindVariable(
*/
#ifdef HAVE_COREFOUNDATION
+#ifdef TCL_FRAMEWORK
static int
MacOSXGetLibraryPath(
Tcl_Interp *interp,
int maxPathLen,
char *tclLibPath)
{
- int foundInFramework = TCL_ERROR;
-
-#ifdef TCL_FRAMEWORK
- foundInFramework = Tcl_MacOSXOpenVersionedBundleResources(interp,
+ return Tcl_MacOSXOpenVersionedBundleResources(interp,
"com.tcltk.tcllibrary", TCL_FRAMEWORK_VERSION, 0, maxPathLen,
tclLibPath);
+}
#else
- (void)interp;
- (void)maxPathLen;
- (void)tclLibPath;
-#endif
-
- return foundInFramework;
+static int
+MacOSXGetLibraryPath(
+ TCL_UNUSED(Tcl_Interp *),
+ TCL_UNUSED(int),
+ TCL_UNUSED(char *))
+{
+ return TCL_ERROR;
}
+#endif
#endif /* HAVE_COREFOUNDATION */
/*