diff options
| author | Sven Gothel <[email protected]> | 2015-03-23 03:51:23 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-23 03:51:23 +0100 |
| commit | 532b8df474976b474f0cf4eb2d93588ded2ad3fe (patch) | |
| tree | 63d7007f5f535034364cd1726cbe667e41388775 /make/stub_includes/jni/macosx | |
| parent | 030b580cf8bb7f1e91eed6e47a341eb50fc2e6be (diff) | |
Import JOGL's JNI header and unify them for GlueGen and C-Compiler usage.
We had macosx JNI header and different JNI header included in JOGL
for native compilation and GlueGen runs.
This unifies the header for any use.
Diffstat (limited to 'make/stub_includes/jni/macosx')
| -rw-r--r-- | make/stub_includes/jni/macosx/jawt_md.h | 7 | ||||
| -rw-r--r-- | make/stub_includes/jni/macosx/jni_md.h | 27 |
2 files changed, 13 insertions, 21 deletions
diff --git a/make/stub_includes/jni/macosx/jawt_md.h b/make/stub_includes/jni/macosx/jawt_md.h index 3b019dd..519a513 100644 --- a/make/stub_includes/jni/macosx/jawt_md.h +++ b/make/stub_includes/jni/macosx/jawt_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. - * * This C header file is derived from Apple's Java SDK provided C header file * with the following copyright notice: * @@ -59,7 +54,7 @@ JAWT_MacOSXDrawingSurfaceInfo; @property (readonly) CALayer *windowLayer; @end -#endif /* __GLUEGEN__ */ +#endif __GLUEGEN__ #ifdef __cplusplus } 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_ */ |