[kaffe] CVS kaffe (dalibor): Fixed various nested-extern warnings

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Thu Mar 25 09:58:03 2004


PatchSet 4581 
Date: 2004/03/25 17:53:00
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fixed various nested-extern warnings

2004-03-25  Dalibor Topic <robilad@kaffe.org>

        * config/i386/jit3-i386.def,
        kaffe/kaffevm/baseClasses.c,
        kaffe/kaffevm/debug.c,
        kaffe/kaffevm/external.c,
        kaffe/kaffevm/jit3/icode.c:
        Fixed various nested-extern warnings.

Members: 
	ChangeLog:1.2159->1.2160 
	config/i386/jit3-i386.def:1.21->1.22 
	kaffe/kaffevm/baseClasses.c:1.47->1.48 
	kaffe/kaffevm/debug.c:1.48->1.49 
	kaffe/kaffevm/external.c:1.52->1.53 
	kaffe/kaffevm/jit3/icode.c:1.36->1.37 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2159 kaffe/ChangeLog:1.2160
--- kaffe/ChangeLog:1.2159	Thu Mar 25 10:40:16 2004
+++ kaffe/ChangeLog	Thu Mar 25 17:53:00 2004
@@ -1,5 +1,14 @@
 2004-03-25  Dalibor Topic <robilad@kaffe.org>
 
+        * config/i386/jit3-i386.def,
+        kaffe/kaffevm/baseClasses.c,
+        kaffe/kaffevm/debug.c,
+        kaffe/kaffevm/external.c,
+        kaffe/kaffevm/jit3/icode.c:
+	Fixed various nested-extern warnings.
+
+2004-03-25  Dalibor Topic <robilad@kaffe.org>
+
 	* kaffe/kaffevm/systems/unix-pthreads/lock-impl.c
 	(jcondvar_wait): Renamed stat to status to fix a compiler
 	warning and clarify code.
Index: kaffe/config/i386/jit3-i386.def
diff -u kaffe/config/i386/jit3-i386.def:1.21 kaffe/config/i386/jit3-i386.def:1.22
--- kaffe/config/i386/jit3-i386.def:1.21	Sat Oct 11 20:45:48 2003
+++ kaffe/config/i386/jit3-i386.def	Thu Mar 25 17:53:03 2004
@@ -437,10 +437,10 @@
 #endif
 }
 
+extern label *getLastEpilogueLabel(void);
+
 define_insn(epilogue, epilogue_xxx)
-{
-	extern label *getLastEpilogueLabel(void);
-	
+{	
 	label *el;
 
 	if( (el = getLastEpilogueLabel()) && (el->at == (CODEPC - 4)) )
Index: kaffe/kaffe/kaffevm/baseClasses.c
diff -u kaffe/kaffe/kaffevm/baseClasses.c:1.47 kaffe/kaffe/kaffevm/baseClasses.c:1.48
--- kaffe/kaffe/kaffevm/baseClasses.c:1.47	Mon Mar  8 21:21:07 2004
+++ kaffe/kaffe/kaffevm/baseClasses.c	Thu Mar 25 17:53:03 2004
@@ -97,6 +97,8 @@
 void initNative(void);
 void initThreads(void);
 
+extern JavaVMInitArgs Kaffe_JavaVMArgs[];
+
 /*
  * Initialise the machine.
  *
@@ -106,7 +108,6 @@
 initialiseKaffe(void)
 {
         /* Set default thread stack size if not set */
-        extern JavaVMInitArgs Kaffe_JavaVMArgs[];
 	int threadStackSize;
 
 	/* Machine specific initialisation first */
Index: kaffe/kaffe/kaffevm/debug.c
diff -u kaffe/kaffe/kaffevm/debug.c:1.48 kaffe/kaffe/kaffevm/debug.c:1.49
--- kaffe/kaffe/kaffevm/debug.c:1.48	Sun Jan 25 18:53:34 2004
+++ kaffe/kaffe/kaffevm/debug.c	Thu Mar 25 17:53:03 2004
@@ -37,6 +37,10 @@
 /* Default debugging mask to use (if debug is enabled) */
 #define DEFAULT_DEBUG_MASK	DBG_NONE
 
+#if defined(TRANSLATOR)
+extern int jit_debug;
+#endif /* defined(TRANSLATOR) */
+
 static char *debugBuffer;
 static int bufferBegin = 0;
 static int bufferSz = 16 * 1024;
@@ -293,7 +297,6 @@
 
 	if (kaffevmDebugMask & DBG_JIT) {
 #if defined(TRANSLATOR)
-		extern int jit_debug;
 		jit_debug = 1;
 #else
 		dprintf(
@@ -343,7 +346,6 @@
 	once = 1;
 #if defined(TRANSLATOR) && defined(KAFFE_VMDEBUG)
 	{
-		extern int jit_debug;
 		if (getenv("JIT_DEBUG"))
 			jit_debug = 1;
 	}
Index: kaffe/kaffe/kaffevm/external.c
diff -u kaffe/kaffe/kaffevm/external.c:1.52 kaffe/kaffe/kaffevm/external.c:1.53
--- kaffe/kaffe/kaffevm/external.c:1.52	Tue Feb  3 17:32:43 2004
+++ kaffe/kaffe/kaffevm/external.c	Thu Mar 25 17:53:04 2004
@@ -48,6 +48,8 @@
 #include <unixlib/local.h>
 #endif
 
+extern void Kaffe_KNI_wrapper(Method* xmeth, void* func);
+
 #ifndef STUB_PREFIX
 #define STUB_PREFIX ""
 #define STUB_PREFIX_LEN 0
@@ -435,7 +437,6 @@
 	func = loadNativeLibrarySym(stub);
 	if (func != 0) {
 		/* Fill it in */
-		extern void Kaffe_KNI_wrapper(Method* xmeth, void* func);
 		Kaffe_KNI_wrapper(m, func);
 		return (true);
 	}
Index: kaffe/kaffe/kaffevm/jit3/icode.c
diff -u kaffe/kaffe/kaffevm/jit3/icode.c:1.36 kaffe/kaffe/kaffevm/jit3/icode.c:1.37
--- kaffe/kaffe/kaffevm/jit3/icode.c:1.36	Wed Mar 10 17:48:03 2004
+++ kaffe/kaffe/kaffevm/jit3/icode.c	Thu Mar 25 17:53:04 2004
@@ -70,10 +70,11 @@
 /*									   */
 
 #if defined(HAVE_spill_int)
+void HAVE_spill_int(sequence*);
+
 void
 spill_int(SlotData* src)
 {
-	void HAVE_spill_int(sequence*);
 	sequence s;
 	seq_dst(&s) = src;
 	seq_value(&s, 1) = slotOffsetNoSpill(src, Rint);
@@ -82,10 +83,11 @@
 #endif
 
 #if defined(HAVE_reload_int)
+void HAVE_reload_int(sequence*);
+
 void
 reload_int(SlotData* dst)
 {
-	void HAVE_reload_int(sequence*);
 	sequence s;
 	seq_dst(&s) = dst;
 	seq_value(&s, 1) = slotOffsetNoSpill(dst, Rint);
@@ -94,10 +96,11 @@
 #endif
 
 #if defined(HAVE_spill_ref)
+void HAVE_spill_ref(sequence*);
+
 void
 spill_ref(SlotData* src)
 {
-	void HAVE_spill_ref(sequence*);
 	sequence s;
 	seq_dst(&s) = src;
 	seq_value(&s, 1) = slotOffsetNoSpill(src, Rref);
@@ -106,10 +109,11 @@
 #endif
 
 #if defined(HAVE_reload_ref)
+void HAVE_reload_ref(sequence*);
+
 void
 reload_ref(SlotData* dst)
 {
-	void HAVE_reload_ref(sequence*);
 	sequence s;
 	seq_dst(&s) = dst;
 	seq_value(&s, 1) = slotOffsetNoSpill(dst, Rref);
@@ -118,10 +122,11 @@
 #endif
 
 #if defined(HAVE_spill_long)
+void HAVE_spill_long(sequence*);
+
 void
 spill_long(SlotData* src)
 {
-	void HAVE_spill_long(sequence*);
 	sequence s;
 	seq_dst(&s) = src;
 	seq_value(&s, 1) = slotOffsetNoSpill(src, Rlong);
@@ -130,10 +135,11 @@
 #endif
 
 #if defined(HAVE_reload_long)
+void HAVE_reload_long(sequence*);
+
 void
 reload_long(SlotData* dst)
 {
-	void HAVE_reload_long(sequence*);
 	sequence s;
 	seq_dst(&s) = dst;
 	seq_value(&s, 1) = slotOffsetNoSpill(dst, Rlong);
@@ -142,10 +148,11 @@
 #endif
 
 #if defined(HAVE_spill_float)
+void HAVE_spill_float(sequence*);
+
 void
 spill_float(SlotData* src)
 {
-	void HAVE_spill_float(sequence*);
 	sequence s;
 	seq_dst(&s) = src;
 	seq_value(&s, 1) = slotOffsetNoSpill(src, Rfloat);
@@ -154,10 +161,11 @@
 #endif
 
 #if defined(HAVE_reload_float)
+void HAVE_reload_float(sequence*);
+
 void
 reload_float(SlotData* dst)
 {
-	void HAVE_reload_float(sequence*);
 	sequence s;
 	seq_dst(&s) = dst;
 	seq_value(&s, 1) = slotOffsetNoSpill(dst, Rfloat);
@@ -166,10 +174,11 @@
 #endif
 
 #if defined(HAVE_spill_double)
+void HAVE_spill_double(sequence*);
+
 void
 spill_double(SlotData* src)
 {
-	void HAVE_spill_double(sequence*);
 	sequence s;
 	seq_dst(&s) = src;
 	seq_value(&s, 1) = slotOffsetNoSpill(src, Rdouble);
@@ -178,10 +187,11 @@
 #endif
 
 #if defined(HAVE_reload_double)
+void HAVE_reload_double(sequence*);
+
 void
 reload_double(SlotData* dst)
 {
-	void HAVE_reload_double(sequence*);
 	sequence s;
 	seq_dst(&s) = dst;
 	seq_value(&s, 1) = slotOffsetNoSpill(dst, Rdouble);