Patch: FYI: even more BC fallout

[Tom Tromey <tromey at redhat dot com>]

I'm checking this in.  I needed this to make libjava build again.
Hopefully this is the last one.

I can't apologize enough for this merge, which has turned out to be a
complete screwup.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* gnu/gcj/util/natDebug.cc (getField): Don't qualify name.
	* java/lang/Class.h (_Jv_Linker): Declare.
	(Class): Fix names of friends.
	(_Jv_getInterfaceMethod): Declare.

Index: gnu/gcj/util/natDebug.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/gcj/util/natDebug.cc,v
retrieving revision 1.2
diff -u -r1.2 natDebug.cc
--- gnu/gcj/util/natDebug.cc 25 Nov 2004 11:54:53 -0000 1.2
+++ gnu/gcj/util/natDebug.cc 26 Nov 2004 02:10:55 -0000
@@ -40,8 +40,8 @@
 }
 
 static void *
-::getField (::java::lang::Object *obj, 
-	    ::java::lang::reflect::Field *field)
+getField (::java::lang::Object *obj, 
+	  ::java::lang::reflect::Field *field)
 {
   using namespace java::lang::reflect;
   
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/Class.h,v
retrieving revision 1.73
diff -u -r1.73 Class.h
--- java/lang/Class.h 25 Nov 2004 03:47:03 -0000 1.73
+++ java/lang/Class.h 26 Nov 2004 02:10:55 -0000
@@ -61,6 +61,7 @@
 struct _Jv_VTable;
 union _Jv_word;
 struct _Jv_ArrayVTable;
+class _Jv_Linker;
 class _Jv_ExecutionEngine;
 class _Jv_CompiledEngine;
 class _Jv_InterpreterEngine;
@@ -186,6 +187,10 @@
 void *_Jv_AllocPtrFreeObj (jint, jclass);
 void *_Jv_AllocArray (jint, jclass);
 
+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,
@@ -454,9 +459,9 @@
   friend jboolean (::_Jv_CheckAccess) (jclass self_klass, jclass other_klass,
 				   jint flags);
   
-  friend bool _Jv_getInterfaceMethod(jclass, jclass&, int&, 
-				     const _Jv_Utf8Const*,
-				     const _Jv_Utf8Const*);
+  friend bool (::_Jv_getInterfaceMethod) (jclass, jclass&, int&, 
+					  const _Jv_Utf8Const*,
+					  const _Jv_Utf8Const*);
 
   friend jclass (::_Jv_GetArrayClass) (jclass klass,
 				       java::lang::ClassLoader *loader);
@@ -478,10 +483,10 @@
   friend class gnu::gcj::runtime::StackTrace;
   friend class java::io::VMObjectStreamClass;
 
-  friend class _Jv_Linker;
-  friend class _Jv_ExecutionEngine;
-  friend class _Jv_CompiledEngine;
-  friend class _Jv_InterpreterEngine;
+  friend class ::_Jv_Linker;
+  friend class ::_Jv_ExecutionEngine;
+  friend class ::_Jv_CompiledEngine;
+  friend class ::_Jv_InterpreterEngine;
 
   friend void ::_Jv_sharedlib_register_hook (jclass klass);