diff options
| author | dgp <dgp@users.sourceforge.net> | 2014-10-21 18:43:14 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2014-10-21 18:43:14 (GMT) |
| commit | 1e868680a1a0c0827ca1f33ae7a716413f1b2797 (patch) | |
| tree | 9e2d945c7c6cd4da05de59c67d5ebc863d90750e | |
| parent | fc778515411d40a88f97c47c447abd22187c6441 (diff) | |
| parent | 750d7de1b0d2ac00205dcd6d25b25006e530aa12 (diff) | |
| download | tk-1e868680a1a0c0827ca1f33ae7a716413f1b2797.zip tk-1e868680a1a0c0827ca1f33ae7a716413f1b2797.tar.gz tk-1e868680a1a0c0827ca1f33ae7a716413f1b2797.tar.bz2 | |
merge trunk
| -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 1f70149..aaeb348 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -236,11 +236,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 /* |