diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-16 22:33:02 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-16 22:33:02 +0000 |
| commit | ce958f0eda1adc860081aa46cf5d6d0f62644285 (patch) | |
| tree | 64e32591f27a799f39718a3672ec5eecb78f0e4c /libjava/include/jvm.h | |
| parent | d4652353843fddfcdab818810b5406737349afc7 (diff) | |
| download | gcc-ce958f0eda1adc860081aa46cf5d6d0f62644285.tar.gz | |
For PR libgcj/5103:
* include/jvm.h (__GCJ_JNI_IMPL__): Define.
* include/config.h.in: Rebuilt.
* configure: Rebuilt.
* configure.in: Define JV_HAVE_INTTYPES_H if inttypes.h found.
Added comment for HAVE_DLOPEN to avoid autoheader error.
* gcj/libgcj-config.h.in (JV_HAVE_INTTYPES_H): Added.
* include/jni.h: Include <gcj/libgcj-config.h>. Don't include
CNI-specific headers if we are compiling ordinary JNI code with a
C++ compiler. Include <inttypes.h> and JNIWeakRef.h when
appropriate.
* jni.cc: Don't include JNIWeakRef.h.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48082 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/include/jvm.h')
| -rw-r--r-- | libjava/include/jvm.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h index ada8e11a2e1..bef5b1833eb 100644 --- a/libjava/include/jvm.h +++ b/libjava/include/jvm.h @@ -11,6 +11,12 @@ details. */ #ifndef __JAVA_JVM_H__ #define __JAVA_JVM_H__ +// Define this before including jni.h. +// jni.h is included by jvmpi.h, which might be included. We define +// this unconditionally because it is convenient and it lets other +// files include jni.h without difficulty. +#define __GCJ_JNI_IMPL__ + #include <gcj/javaprims.h> #include <java-assert.h> @@ -358,6 +364,7 @@ bool _Jv_VerifyIdentifier (_Jv_Utf8Const *); bool _Jv_ClassNameSamePackage (_Jv_Utf8Const *name1, _Jv_Utf8Const *name2); #ifdef ENABLE_JVMPI + #include "jvmpi.h" extern void (*_Jv_JVMPI_Notify_OBJECT_ALLOC) (JVMPI_Event *event); |