diff options
| author | kevin_walzer <kevin_walzer@noemail.net> | 2014-10-21 15:00:47 (GMT) |
|---|---|---|
| committer | kevin_walzer <kevin_walzer@noemail.net> | 2014-10-21 15:00:47 (GMT) |
| commit | 6fdcdc323916848fb9c372bee4fa673caf84c32a (patch) | |
| tree | 48df5b21b54a30b0e44a748ece17ddcb6ab76f15 | |
| parent | bb5b9492a5a0041687dc4291dd3958bcbdbbac58 (diff) | |
| download | tk-6fdcdc323916848fb9c372bee4fa673caf84c32a.zip tk-6fdcdc323916848fb9c372bee4fa673caf84c32a.tar.gz tk-6fdcdc323916848fb9c372bee4fa673caf84c32a.tar.bz2 | |
Fix for Mac crash on Yosemite because of changes in version checking
FossilOrigin-Name: e8a1bb0f4caf07dc3e4bc4c8a01bdc94e92f182d
| -rw-r--r-- | macosx/tkMacOSXInit.c | 7 |
1 files changed, 6 insertions, 1 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 /* |