diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2014-10-21 15:00:47 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2014-10-21 15:00:47 (GMT) |
| commit | fc006f81effdc9a726a252771462754168b28cc7 (patch) | |
| tree | cabf1b7dbddfd0dde86904090bfa120cb74d990e /macosx | |
| parent | a7060fd784a2dab89cbfd8093e613686989296cc (diff) | |
| download | tk-fc006f81effdc9a726a252771462754168b28cc7.zip tk-fc006f81effdc9a726a252771462754168b28cc7.tar.gz tk-fc006f81effdc9a726a252771462754168b28cc7.tar.bz2 | |
Fix for Mac crash on Yosemite because of changes in version checking
Diffstat (limited to 'macosx')
| -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 /* |