diff options
Diffstat (limited to 'libjava/include')
| -rw-r--r-- | libjava/include/jni.h | 5 | ||||
| -rw-r--r-- | libjava/include/jvm.h | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/libjava/include/jni.h b/libjava/include/jni.h index 60b2302754a..c5ca7dc95dd 100644 --- a/libjava/include/jni.h +++ b/libjava/include/jni.h @@ -133,7 +133,7 @@ struct JNINativeInterface void (*FatalError) (JNIEnv *, const char *); jint (*PushLocalFrame) (JNIEnv *, jint); - jobject (*PopLocalFrame) (JNIEnv *, jobject result); + jobject (*PopLocalFrame) (JNIEnv *, jobject); jobject (*NewGlobalRef) (JNIEnv *, jobject); void (*DeleteGlobalRef) (JNIEnv *, jobject); @@ -538,6 +538,9 @@ private: /* The class of the current native method. */ jclass klass; + /* The chain of local frames. */ + struct _Jv_JNI_LocalFrame *locals; + public: jclass GetSuperclass (jclass cl) { return p->GetSuperclass (this, cl); } diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index a8d1fac6524..c9eb1b95c80 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -72,6 +72,10 @@ void _Jv_InitGC (void); /* Register a finalizer. */ void _Jv_RegisterFinalizer (void *object, _Jv_FinalizerFunc *method); +/* Allocate some unscanned, unmoveable memory. Return NULL if out of + memory. */ +void *_Jv_MallocUnchecked (jsize size) __attribute__((__malloc__)); + /* Run finalizers for objects ready to be finalized.. */ void _Jv_RunFinalizers (void); /* Run all finalizers. Should be called only before exit. */ @@ -197,4 +201,8 @@ extern "C" extern char *_Jv_ThisExecutable (void); extern void _Jv_ThisExecutable (const char *); +/* Initialize JNI. */ +extern void _Jv_JNI_Init (void); + + #endif /* __JAVA_JVM_H__ */ |
