summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-10-21 18:43:14 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-10-21 18:43:14 (GMT)
commitba8f3b0995b341e84cdff9bde61ab55b79cd6e51 (patch)
tree9e2d945c7c6cd4da05de59c67d5ebc863d90750e /macosx
parent9e8106de69e58e125920c9d7c3323f205bb711e2 (diff)
parent48becc71dabdff1fee50892a3f25600dd7e7cc08 (diff)
downloadtk-ba8f3b0995b341e84cdff9bde61ab55b79cd6e51.zip
tk-ba8f3b0995b341e84cdff9bde61ab55b79cd6e51.tar.gz
tk-ba8f3b0995b341e84cdff9bde61ab55b79cd6e51.tar.bz2
merge trunk
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXInit.c7
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
/*