projects
/
cacao.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* configure.ac,
[cacao.git]
/
src
/
native
/
jni.h
diff --git
a/src/native/jni.h
b/src/native/jni.h
index 693f1e3de3e21ac52a14d2631011f54b1952ba69..8848d524577cfd27a692e1822d62f4d1c0e0c464 100644
(file)
--- a/
src/native/jni.h
+++ b/
src/native/jni.h
@@
-22,7
+22,7
@@
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- $Id: jni.h
7921 2007-05-20 23:14:11Z mich
i $
+ $Id: jni.h
8132 2007-06-22 11:15:47Z twist
i $
*/
*/
@@
-43,8
+43,11
@@
#include "config.h"
#include "config.h"
-#include CLASSPATH_JNI_H
+/* XXX quick hack to not include GCJ's jni_md.h */
+#define __GCJ_JNI_MD_H__
+#include CLASSPATH_JNI_MD_H
+#include CLASSPATH_JNI_H
#ifndef _JNI_H
#define _JNI_H
#ifndef _JNI_H
#define _JNI_H
@@
-66,7
+69,7
@@
typedef struct localref_table localref_table;
typedef struct _Jv_JNIEnv _Jv_JNIEnv;
struct _Jv_JNIEnv {
typedef struct _Jv_JNIEnv _Jv_JNIEnv;
struct _Jv_JNIEnv {
- const struct JNINativeInterface
*env;
/* This MUST be the first entry */
+ const struct JNINativeInterface
_ *env;
/* This MUST be the first entry */
};
};
@@
-75,7
+78,7
@@
struct _Jv_JNIEnv {
typedef struct _Jv_JavaVM _Jv_JavaVM;
struct _Jv_JavaVM {
typedef struct _Jv_JavaVM _Jv_JavaVM;
struct _Jv_JavaVM {
- const struct JNIInvokeInterface
*functions;/*
This MUST be the first entry*/
+ const struct JNIInvokeInterface
_ *functions;/*
This MUST be the first entry*/
/* JVM instance-specific variables */
/* JVM instance-specific variables */
@@
-92,8
+95,8
@@
struct _Jv_JavaVM {
/* CACAO related stuff ********************************************************/
/* CACAO related stuff ********************************************************/
-extern const struct JNIInvokeInterface _Jv_JNIInvokeInterface;
-extern struct JNINativeInterface _Jv_JNINativeInterface;
+extern const struct JNIInvokeInterface
_
_Jv_JNIInvokeInterface;
+extern struct JNINativeInterface
_
_Jv_JNINativeInterface;
/* local reference table ******************************************************/
/* local reference table ******************************************************/