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

Hopefully including the top carbon header will fix the issues we had

Browse Source 
when we tried to include just Gestalt.h
This commit is contained in:
jent 2009-07-02 03:13:39 -06:00
parent 2639d94ebc
commit 8c3d65a835
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
classpath/java-lang.cpp
View File

@ -38,7 +38,7 @@
#ifdef __APPLE__ #ifdef __APPLE__
# define SO_SUFFIX ".jnilib" # define SO_SUFFIX ".jnilib"
//#include "Gestalt.h" #include <Carbon/Carbon.h>
#elif defined WIN32 #elif defined WIN32
# define SO_SUFFIX ".dll" # define SO_SUFFIX ".dll"
#else #else
@ -380,16 +380,15 @@ Java_java_lang_System_getProperty(JNIEnv* e, jclass, jstring name,
#endif #endif
} else if (strcmp(chars, "os.version") == 0) { } else if (strcmp(chars, "os.version") == 0) {
#ifdef __APPLE__ #ifdef __APPLE__
/* unsigned size = 32; unsigned size = 32;
char buffer[size]; char buffer[size];
long minorVersion, majorVersion; long minorVersion, majorVersion;
Gestalt(gestaltSystemVersionMajor, &majorVersion); Gestalt(gestaltSystemVersionMajor, &majorVersion);
Gestalt(gestaltSystemVersionMinor, &minorVersion); Gestalt(gestaltSystemVersionMinor, &minorVersion);
snprintf(buffer, size, "%lld.%lld", majorVersion, minorVersion); snprintf(buffer, size, "%ld.%ld", majorVersion, minorVersion);
r = e->NewStringUTF(buffer);*/ r = e->NewStringUTF(buffer);
r = e->NewStringUTF("I hate OSX");
#else #else
struct utsname system_id; struct utsname system_id;
uname(&system_id); uname(&system_id);