diff options
| author | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
|---|---|---|
| committer | Matthias Klose <doko@gcc.gnu.org> | 2008-06-28 13:29:13 +0000 |
| commit | e0441a5bfb29083a532307ba2b1fd6d6d13944ba (patch) | |
| tree | 602cd7aa7c947386134690d8e0f6b53abcdeacb9 /libjava/classpath/include/jni.h | |
| parent | 15c151967dd1cde61b79d26374f608f63a29d411 (diff) | |
| download | gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.zip gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.gz gcc-e0441a5bfb29083a532307ba2b1fd6d6d13944ba.tar.bz2 | |
Import GNU Classpath (classpath-0_97_2-release).
libjava/
2008-06-28 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (classpath-0_97_2-release).
* Regenerate class and header files.
* Regenerate auto* files.
* gcj/javaprims.h: Define jobjectRefType.
* jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
(_Jv_JNIFunctions): Initialize GetObjectRefType.
* gnu/classpath/jdwp/VMVirtualMachine.java,
java/security/VMSecureRandom.java: Merge from classpath.
* HACKING: Fix typo.
* ChangeLog-2007: New file.
* configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.
libjava/classpath/
2008-06-28 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_javac.m4: Disable check for JAVAC, when
not configured with --enable-java-maintainer-mode.
* aclocal.m4, configure: Regenerate.
* native/jni/gstreamer-peer/Makefile.am: Do not link with
libclasspathnative.
* native/jni/gstreamer-peer/Makefile.in: Regenerate.
* tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
JCOMPILER, drop flags not understood by gcj.
From-SVN: r137223
Diffstat (limited to 'libjava/classpath/include/jni.h')
| -rw-r--r-- | libjava/classpath/include/jni.h | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/libjava/classpath/include/jni.h b/libjava/classpath/include/jni.h index 1c9be95..707edd6 100644 --- a/libjava/classpath/include/jni.h +++ b/libjava/classpath/include/jni.h @@ -136,12 +136,23 @@ struct _jfieldID; struct _jmethodID; typedef struct _jfieldID *jfieldID; typedef struct _jmethodID *jmethodID; + +enum _jobjectRefType +{ + JNIInvalidRefType = 0, + JNILocalRefType = 1, + JNIGlobalRefType = 2, + JNIWeakGlobalRefType = 3 +}; + +typedef enum _jobjectRefType jobjectRefType; #endif /* Version numbers. */ #define JNI_VERSION_1_1 0x00010001 #define JNI_VERSION_1_2 0x00010002 #define JNI_VERSION_1_4 0x00010004 +#define JNI_VERSION_1_6 0x00010006 /* Used when releasing array elements. */ #define JNI_COMMIT 1 @@ -612,6 +623,7 @@ struct JNINativeInterface_ jint (JNICALL *GetJavaVM) (JNIEnv *, JavaVM **); /* ---- JNI 1.2 functions ---- */ + void (JNICALL *GetStringRegion) (JNIEnv *, jstring, jsize, jsize, jchar *); void (JNICALL *GetStringUTFRegion) (JNIEnv *, jstring, jsize, @@ -633,9 +645,14 @@ struct JNINativeInterface_ jboolean (JNICALL *ExceptionCheck) (JNIEnv *); /* ---- JNI 1.4 functions ---- */ + jobject (JNICALL *NewDirectByteBuffer) (JNIEnv *, void *, jlong); void * (JNICALL *GetDirectBufferAddress) (JNIEnv *, jobject); jlong (JNICALL *GetDirectBufferCapacity) (JNIEnv *, jobject); + + /* ---- JNI 1.6 functions ---- */ + + jobjectRefType (JNICALL *GetObjectRefType) (JNIEnv *, jobject); }; #ifdef __cplusplus @@ -1488,6 +1505,8 @@ public: jint GetJavaVM (JavaVM ** val0) { return p->GetJavaVM (this, val0); } + /* ---- JNI 1.2 functions ---- */ + void GetStringRegion (jstring val0, jsize val1, jsize val2, jchar * val3) { p->GetStringRegion (this, val0, val1, val2, val3); } @@ -1515,6 +1534,8 @@ public: jboolean ExceptionCheck () { return p->ExceptionCheck (this); } + /* ---- JNI 1.4 functions ---- */ + jobject NewDirectByteBuffer (void *addr, jlong capacity) { return p->NewDirectByteBuffer (this, addr, capacity); } @@ -1523,6 +1544,11 @@ public: jlong GetDirectBufferCapacity (jobject buf) { return p->GetDirectBufferCapacity (this, buf); } + + /* ---- JNI 1.6 functions ---- */ + + jobjectRefType GetObjectRefType (jobject obj) + { return p->GetObjectRefType (this, obj); } }; #endif /* __cplusplus */ |