From ce1d59aac7149a4f2814c2a09f11cce8a29a5dfc Mon Sep 17 00:00:00 2001 From: Joel Dice Date: Thu, 16 Jan 2014 17:00:52 -0700 Subject: [PATCH] stop using Gestalt on OS X This function has been deprecated for a while and is not even part of the latest SDK, so it's time to say goodbye. --- classpath/java-lang.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/classpath/java-lang.cpp b/classpath/java-lang.cpp index 8b6c11156a..4d1a280e61 100644 --- a/classpath/java-lang.cpp +++ b/classpath/java-lang.cpp @@ -739,26 +739,9 @@ Java_java_lang_System_getProperty(JNIEnv* e, jclass, jstring name, r = e->NewStringUTF("Linux"); #endif } else if (strcmp(chars, "os.version") == 0) { -#if (defined __APPLE__) && (! defined AVIAN_IOS) - unsigned size = 32; - char buffer[size]; -#ifdef ARCH_x86_64 - int32_t minorVersion, majorVersion; -#else - long minorVersion, majorVersion; -#endif - - Gestalt(gestaltSystemVersionMajor, &majorVersion); - Gestalt(gestaltSystemVersionMinor, &minorVersion); - - snprintf(buffer, size, "%d.%d", static_cast(majorVersion), - static_cast(minorVersion)); - r = e->NewStringUTF(buffer); -#else struct utsname system_id; uname(&system_id); r = e->NewStringUTF(system_id.release); -#endif } else if (strcmp(chars, "os.arch") == 0) { #ifdef ARCH_x86_32 r = e->NewStringUTF("x86");