diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-06 17:35:08 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-01-06 17:35:08 (GMT) |
| commit | 95e7615fc46beabd9927303aebdeef45cdbca2f8 (patch) | |
| tree | 0816e5ed0e9ca929aa2f3c0ebd97a38b0232dbc7 /unix | |
| parent | 8494cde0844422529578c702ebaa3382346c1e08 (diff) | |
| parent | ba6fe47daab7593fc0e2d80184a15c791e73dcf7 (diff) | |
| download | tcl-95e7615fc46beabd9927303aebdeef45cdbca2f8.zip tcl-95e7615fc46beabd9927303aebdeef45cdbca2f8.tar.gz tcl-95e7615fc46beabd9927303aebdeef45cdbca2f8.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 | ||||
| -rw-r--r-- | unix/tclUnixInit.c | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/unix/configure b/unix/configure index 5b85824..4855fd3 100755 --- a/unix/configure +++ b/unix/configure @@ -6654,7 +6654,7 @@ printf "%s\n" "#define MODULE_SCOPE __private_extern__" >>confdefs.h fi CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" - LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" + LD_LIBRARY_PATH_VAR="DYLD_FALLBACK_LIBRARY_PATH" printf "%s\n" "#define MAC_OSX_TCL 1" >>confdefs.h diff --git a/unix/tcl.m4 b/unix/tcl.m4 index dcabb94..84436a3 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1459,7 +1459,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ ]) CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" - LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH" + LD_LIBRARY_PATH_VAR="DYLD_FALLBACK_LIBRARY_PATH" AC_DEFINE(MAC_OSX_TCL, 1, [Is this a Mac I see before me?]) PLAT_OBJS='${MAC_OSX_OBJS}' PLAT_SRCS='${MAC_OSX_SRCS}' diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index 995bd83..8f7a737 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -897,6 +897,9 @@ TclpSetVariables( GetSystemInfo(&sysInfo); + if (osInfo.dwMajorVersion == 10 && osInfo.dwBuildNumber >= 22000) { + osInfo.dwMajorVersion = 11; + } Tcl_SetVar2(interp, "tcl_platform", "os", "Windows NT", TCL_GLOBAL_ONLY); sprintf(buffer, "%d.%d", osInfo.dwMajorVersion, osInfo.dwMinorVersion); Tcl_SetVar2(interp, "tcl_platform", "osVersion", buffer, TCL_GLOBAL_ONLY); |