diff options
Diffstat (limited to 'make/stub_includes/jni/macosx/jni_md.h')
| -rw-r--r-- | make/stub_includes/jni/macosx/jni_md.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/make/stub_includes/jni/macosx/jni_md.h b/make/stub_includes/jni/macosx/jni_md.h index 7f52704..4aaa1f9 100644 --- a/make/stub_includes/jni/macosx/jni_md.h +++ b/make/stub_includes/jni/macosx/jni_md.h @@ -1,9 +1,4 @@ /* - * Temporary workaround! - * - * Provided darwin/jawt_md.h from Oracle for OSX / Java7 - * has X11 dependencies and does not define JAWT_SurfaceLayers. - * * @(#)jni_md.h 1.18 03/12/19 * * This C header file is derived from Sun Microsystem's Java SDK provided C header file @@ -32,16 +27,18 @@ #ifndef _JAVASOFT_JNI_MD_H_ #define _JAVASOFT_JNI_MD_H_ -#define JNIEXPORT __attribute__((visibility("default"))) -#define JNIIMPORT -#define JNICALL +#ifdef __GLUEGEN__ + #define JNIEXPORT + #define JNIIMPORT + #define JNICALL +#else /* __GLUEGEN__ */ + #define JNIEXPORT __attribute__((visibility("default"))) + #define JNIIMPORT __attribute__((visibility("default"))) + #define JNICALL +#endif /* __GLUEGEN__ */ -#if __LP64__ -typedef int jint; -#else -typedef long jint; -#endif -typedef long long jlong; -typedef signed char jbyte; +typedef int8_t jbyte; +typedef int32_t jint; +typedef int64_t jlong; #endif /* !_JAVASOFT_JNI_MD_H_ */ |