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. From-SVN: r48082
This commit is contained in:
parent
68940f3f3c
commit
04942eac9b
8 changed files with 493 additions and 316 deletions
|
@ -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);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue