mirror of
https://github.com/corda/corda.git
synced 2025-01-23 12:58:35 +00:00
Commented out changes to avian till I can figure out why I can compile
using the deploy script, but no one else can
This commit is contained in:
parent
3367ac88e3
commit
2639d94ebc
@ -38,7 +38,7 @@
|
|||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
# define SO_SUFFIX ".jnilib"
|
# define SO_SUFFIX ".jnilib"
|
||||||
#include "Gestalt.h"
|
//#include "Gestalt.h"
|
||||||
#elif defined WIN32
|
#elif defined WIN32
|
||||||
# define SO_SUFFIX ".dll"
|
# define SO_SUFFIX ".dll"
|
||||||
#else
|
#else
|
||||||
@ -380,7 +380,7 @@ 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;
|
||||||
|
|
||||||
@ -388,7 +388,8 @@ Java_java_lang_System_getProperty(JNIEnv* e, jclass, jstring name,
|
|||||||
Gestalt(gestaltSystemVersionMinor, &minorVersion);
|
Gestalt(gestaltSystemVersionMinor, &minorVersion);
|
||||||
|
|
||||||
snprintf(buffer, size, "%lld.%lld", majorVersion, minorVersion);
|
snprintf(buffer, size, "%lld.%lld", 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);
|
||||||
|
Loading…
Reference in New Issue
Block a user