ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

stop using Gestalt on OS X

Browse Source 
This function has been deprecated for a while and is not even part of
the latest SDK, so it's time to say goodbye.
This commit is contained in:
Joel Dice 2014-01-16 17:00:52 -07:00
parent 2ac66cb48c
commit ce1d59aac7
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
classpath/java-lang.cpp
View File

@ -739,26 +739,9 @@ Java_java_lang_System_getProperty(JNIEnv* e, jclass, jstring name,
r = e->NewStringUTF("Linux"); r = e->NewStringUTF("Linux");
#endif #endif
} else if (strcmp(chars, "os.version") == 0) { } 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<int32_t>(majorVersion),
static_cast<int32_t>(minorVersion));
r = e->NewStringUTF(buffer);
#else
struct utsname system_id; struct utsname system_id;
uname(&system_id); uname(&system_id);
r = e->NewStringUTF(system_id.release); r = e->NewStringUTF(system_id.release);
#endif
} else if (strcmp(chars, "os.arch") == 0) { } else if (strcmp(chars, "os.arch") == 0) {
#ifdef ARCH_x86_32 #ifdef ARCH_x86_32
r = e->NewStringUTF("x86"); r = e->NewStringUTF("x86");