diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-17 19:05:37 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-05-17 19:05:37 (GMT) |
commit | 37c4a581adba19a71bdc30897e11a4be2d24b2ce (patch) | |
tree | 9e1c46e9cd0b8c0e41b8d692d4527228a718e7c0 /unix/tclUnixInit.c | |
parent | cfd3e7533755f50f92a64c9a5b637b52f30ae3ee (diff) | |
parent | 4f1ea4779be85d8837f3a133b52d3b5aa9e53fda (diff) | |
download | tcl-37c4a581adba19a71bdc30897e11a4be2d24b2ce.zip tcl-37c4a581adba19a71bdc30897e11a4be2d24b2ce.tar.gz tcl-37c4a581adba19a71bdc30897e11a4be2d24b2ce.tar.bz2 |
Merge 8.7, but keep TCL_THREADS undefined in tcl.h (since that's no longer necessary)
Diffstat (limited to 'unix/tclUnixInit.c')
-rw-r--r-- | unix/tclUnixInit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index b213538..fc98a6f 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -316,7 +316,7 @@ static int MacOSXGetLibraryPath(Tcl_Interp *interp, #endif /* HAVE_COREFOUNDATION */ #if defined(__APPLE__) && (defined(TCL_LOAD_FROM_MEMORY) || ( \ defined(MAC_OS_X_VERSION_MIN_REQUIRED) && ( \ - (defined(TCL_THREADS) && MAC_OS_X_VERSION_MIN_REQUIRED < 1030) || \ + ((!defined(TCL_THREADS) || TCL_THREADS) && MAC_OS_X_VERSION_MIN_REQUIRED < 1030) || \ (defined(__LP64__) && MAC_OS_X_VERSION_MIN_REQUIRED < 1050) || \ (defined(HAVE_COREFOUNDATION) && MAC_OS_X_VERSION_MIN_REQUIRED < 1050)\ ))) |