From ed023f07e4f7afa9ec7b6d43374f3a8502112603 Mon Sep 17 00:00:00 2001 From: ktietz Date: Fri, 8 Apr 2011 14:16:38 +0000 Subject: 2011-04-08 Kai Tietz * configure.ac (libgcj_ld_export_all): Set for windows native targets to export-all-symbols. (LIBGCJ_LD_EXPORT_ALL): Export libgcj_ld_export_all. * Makefile.am (libgcj_la_LDFLAGS): Add LIBGCJ_LD_EXPORT_ALL. * sysdep/i386/backtrace.h (MAIN_FUNC): Define for windows native targets to DllMain. * gcj/javaprims.h (JNICALL): Define it dependent for different windows targets. * include/jni_md.h: Likewise. * headers.txt (_Jv_JNI_ToReflectedField): Mark JNICALLS for friends. (_Jv_JNI_ToReflectedMethod): Likewise. * java/lang/Class.h: Regenerated. * java/lang/reflect/Field.h: Regenerated. * java/lang/reflect/Constructor.h: Regenerated. * java/lang/reflect/Method.h: Regenerated. * configure: Regenerated. * Makefile.in: Regenerated. * include/Makefile.in: Regenerated. * testsuite/Makefile.in: Regenerated. * gcj/Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@172186 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/lang/Class.h | 8 ++++---- libjava/java/lang/reflect/Constructor.h | 4 ++-- libjava/java/lang/reflect/Field.h | 4 ++-- libjava/java/lang/reflect/Method.h | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'libjava/java') diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index d4a918483c3..a05bdb0ad04 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -251,10 +251,10 @@ bool _Jv_getInterfaceMethod(jclass, jclass&, int&, const _Jv_Utf8Const*, const _Jv_Utf8Const*); -jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID, - jboolean); -jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, - jboolean); +jobject JNICALL _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID, + jboolean); +jobject JNICALL _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, + jboolean); jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *); jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *); diff --git a/libjava/java/lang/reflect/Constructor.h b/libjava/java/lang/reflect/Constructor.h index 5a200bc114d..1491ed7b5cf 100644 --- a/libjava/java/lang/reflect/Constructor.h +++ b/libjava/java/lang/reflect/Constructor.h @@ -11,7 +11,7 @@ jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *); -jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean); +jobject JNICALL _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean); class java::lang::reflect::Constructor : public ::java::lang::reflect::AccessibleObject { @@ -58,7 +58,7 @@ public: static ::java::lang::Class class$; friend jmethodID (::_Jv_FromReflectedConstructor) (java::lang::reflect::Constructor *); - friend jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean); + friend jobject JNICALL (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean); friend class java::lang::Class; }; diff --git a/libjava/java/lang/reflect/Field.h b/libjava/java/lang/reflect/Field.h index 0af95652def..9eb71c3e30e 100644 --- a/libjava/java/lang/reflect/Field.h +++ b/libjava/java/lang/reflect/Field.h @@ -11,7 +11,7 @@ jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *); -jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean); +jobject JNICALL _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean); jobject _Jv_getFieldInternal (java::lang::reflect::Field *f, jclass c, jobject o); class java::lang::reflect::Field : public ::java::lang::reflect::AccessibleObject @@ -90,7 +90,7 @@ public: static ::java::lang::Class class$; friend jfieldID (::_Jv_FromReflectedField) (java::lang::reflect::Field *); - friend jobject (::_Jv_JNI_ToReflectedField) (_Jv_JNIEnv*, jclass, jfieldID, jboolean); + friend jobject JNICALL (::_Jv_JNI_ToReflectedField) (_Jv_JNIEnv*, jclass, jfieldID, jboolean); friend class java::lang::Class; friend jobject (::_Jv_getFieldInternal) (java::lang::reflect::Field *f, jclass c, jobject o); }; diff --git a/libjava/java/lang/reflect/Method.h b/libjava/java/lang/reflect/Method.h index 8a843d5d154..914e04bede8 100644 --- a/libjava/java/lang/reflect/Method.h +++ b/libjava/java/lang/reflect/Method.h @@ -11,7 +11,7 @@ jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *); -jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean); +jobject JNICALL _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean); ::java::lang::reflect::Method *_Jv_GetReflectedMethod (jclass, _Jv_Utf8Const*, _Jv_Utf8Const*); class java::lang::reflect::Method : public ::java::lang::reflect::AccessibleObject @@ -75,7 +75,7 @@ public: static ::java::lang::Class class$; friend jmethodID (::_Jv_FromReflectedMethod) (java::lang::reflect::Method *); - friend jobject (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean); + friend jobject JNICALL (::_Jv_JNI_ToReflectedMethod) (_Jv_JNIEnv *, jclass, jmethodID, jboolean); friend class java::lang::Class; friend class java::io::ObjectInputStream; friend java::lang::reflect::Method* ::_Jv_GetReflectedMethod (jclass, _Jv_Utf8Const*, _Jv_Utf8Const*); -- cgit v1.2.3