Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.396
diff -c -3 -p -r1.396 Makefile.am
*** Makefile.am	24 Jul 2004 16:43:44 -0000	1.396
--- Makefile.am	2 Aug 2004 08:23:16 -0000
*************** java/lang/String.h: java/lang/String.cla
*** 572,595 ****
  
  java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class
  	$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
  	    -friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
  	    -friend 'class java::lang::Class;' \
! 	    -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
  	    $(basename $<)
  
  java/lang/reflect/Field.h: java/lang/reflect/Field.class
  	$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
  	    -friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
! 	    -friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
  	    -friend 'class java::lang::Class;' \
  	    $(basename $<)
  
  java/lang/reflect/Method.h: java/lang/reflect/Method.class
  	$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
  	    -friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
  	    -friend 'class java::lang::Class;' \
  	    -friend 'class java::io::ObjectInputStream;' \
! 	    -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
  	    $(basename $<)
  
  java/lang/reflect/Proxy.h: java/lang/reflect/Proxy.class
--- 572,598 ----
  
  java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class
  	$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
+ 	    -prepend '#include <jni.h>' \
  	    -friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
  	    -friend 'class java::lang::Class;' \
! 	    -friend 'jobject JNICALL _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
  	    $(basename $<)
  
  java/lang/reflect/Field.h: java/lang/reflect/Field.class
  	$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
+ 	    -prepend '#include <jni.h>' \
  	    -friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
! 	    -friend 'jobject JNICALL _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
  	    -friend 'class java::lang::Class;' \
  	    $(basename $<)
  
  java/lang/reflect/Method.h: java/lang/reflect/Method.class
  	$(GCJH) -classpath '' -bootclasspath $(top_builddir) \
+ 	    -prepend '#include <jni.h>' \
  	    -friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
  	    -friend 'class java::lang::Class;' \
  	    -friend 'class java::io::ObjectInputStream;' \
! 	    -friend 'jobject JNICALL _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
  	    $(basename $<)
  
  java/lang/reflect/Proxy.h: java/lang/reflect/Proxy.class
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/Class.h,v
retrieving revision 1.68
diff -c -3 -p -r1.68 Class.h
*** java/lang/Class.h	24 Jul 2004 01:17:29 -0000	1.68
--- java/lang/Class.h	2 Aug 2004 08:24:31 -0000
*************** details.  */
*** 26,31 ****
--- 26,40 ----
  extern "C" void _Jv_InitClass (jclass klass);
  extern "C" void _Jv_RegisterClasses (jclass *classes);
  
+ // And define this here to avoid including jni.h.
+ #ifndef JNICALL
+ #if defined (_WIN32) || defined (__WIN32__) || defined (WIN32)
+ #define JNICALL __stdcall
+ #else
+ #define JNICALL
+ #endif
+ #endif
+ 
  // This must be predefined with "C" linkage.
  extern "C" void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, 
                                                 int meth_idx);
*************** private:   
*** 290,298 ****
    friend void *_Jv_AllocPtrFreeObj (jint, jclass);
    friend void *_Jv_AllocArray (jint, jclass);
  
!   friend jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID,
  					   jboolean);
!   friend jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID,
  					    jboolean);
    friend jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);
  
--- 299,307 ----
    friend void *_Jv_AllocPtrFreeObj (jint, jclass);
    friend void *_Jv_AllocArray (jint, jclass);
  
!   friend jobject JNICALL _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID,
  					   jboolean);
!   friend jobject JNICALL _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID,
  					    jboolean);
    friend jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);