summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2014-10-21 15:00:47 (GMT)
committerKevin Walzer <kw@codebykevin.com>2014-10-21 15:00:47 (GMT)
commit6b7189fe67176362caeb0a64936b14ff7783a30a (patch)
tree48df5b21b54a30b0e44a748ece17ddcb6ab76f15
parentc75c177a0e7cbda54dddac6c90f0c9bbc745c9f0 (diff)
downloadtk-6b7189fe67176362caeb0a64936b14ff7783a30a.zip
tk-6b7189fe67176362caeb0a64936b14ff7783a30a.tar.gz
tk-6b7189fe67176362caeb0a64936b14ff7783a30a.tar.bz2
Fix for Mac crash on Yosemite because of changes in version checking
-rw-r--r--macosx/tkMacOSXInit.c7
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
/*