diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-10-21 18:37:02 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-10-21 18:37:02 (GMT) |
| commit | 11f06cc22a17048c30d82f66c468b484122de1e5 (patch) | |
| tree | e7e53df7c4f5fbeaee3107eba625394173422906 | |
| parent | 971fa23072932f3b4423c904274f82de0833872e (diff) | |
| parent | 3da1bdd7794af6f2179dc7a61d3358fd33578d2f (diff) | |
| download | tk-11f06cc22a17048c30d82f66c468b484122de1e5.zip tk-11f06cc22a17048c30d82f66c468b484122de1e5.tar.gz tk-11f06cc22a17048c30d82f66c468b484122de1e5.tar.bz2 | |
merge 8.5core_8_5_17core_8_5_17_rc
| -rw-r--r-- | macosx/tkMacOSXInit.c | 7 | ||||
| -rw-r--r-- | unix/Makefile.in | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index 2bf1962..1d14990 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -225,11 +225,16 @@ TkpInit( if (!uname(&name)) { tkMacOSXMacOSXVersion = (strtod(name.release, NULL) + 96) * 10; } - if (tkMacOSXMacOSXVersion && + /*Check for new versioning scheme on Yosemite (10.10) and later.*/ + if (MAC_OS_X_VERSION_MIN_REQUIRED > 100000) { + tkMacOSXMacOSXVersion = MAC_OS_X_VERSION_MIN_REQUIRED/100; + } + if (tkMacOSXMacOSXVersion && MAC_OS_X_VERSION_MIN_REQUIRED < 100000 && tkMacOSXMacOSXVersion/10 < MAC_OS_X_VERSION_MIN_REQUIRED/10) { Tcl_Panic("Mac OS X 10.%d or later required !", (MAC_OS_X_VERSION_MIN_REQUIRED/10)-100); } + #ifdef TK_FRAMEWORK /* diff --git a/unix/Makefile.in b/unix/Makefile.in index 1fde28d..d869528 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -186,7 +186,7 @@ KEYSYM_FLAGS = # Tk does not used deprecated Tcl constructs so it should # compile fine with -DTCL_NO_DEPRECATED. To remove its own # set of deprecated code uncomment the second line. -NO_DEPRECATED_FLAGS = +NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED #NO_DEPRECATED_FLAGS = -DTCL_NO_DEPRECATED -DTK_NO_DEPRECATED # Some versions of make, like SGI's, use the following variable to |