[kaffe] CVS kaffe (robilad): Small fixes for compiler warnings

[Kaffe CVS]

PatchSet 5969 
Date: 2005/02/04 10:36:11
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Small fixes for compiler warnings

2005-02-04  Dalibor Topic  <robilad at kaffe.org>

* kaffe/kaffevm/classMethod.c (retry):
Removed unused variables.

* kaffe/kaffevm/findInJar.c (discoveredClassHome):
Only compile in if binreloc is enabled.

* kaffe/kaffevm/classPool.c,
kaffe/kaffevm/intrp/methodcalls.c,
kaffe/kaffevm/intrp/machine.h:
Added missing includes.

* kaffe/kaffevm/jni/jni.c (Kaffe_DestroyJavaVM)
Removed NONRETURNING attribute.

* kaffe/kaffevm/jni/jni_i.h (Kaffe_DestroyJavaVM)
Removed prototype.

Members: 
	ChangeLog:1.3508->1.3509 
	kaffe/kaffevm/classMethod.c:1.132->1.133 
	kaffe/kaffevm/classPool.c:1.32->1.33 
	kaffe/kaffevm/findInJar.c:1.64->1.65 
	kaffe/kaffevm/intrp/machine.h:1.10->1.11 
	kaffe/kaffevm/intrp/methodcalls.c:1.6->1.7 
	kaffe/kaffevm/jni/jni.c:1.16->1.17 
	kaffe/kaffevm/jni/jni_i.h:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3508 kaffe/ChangeLog:1.3509
--- kaffe/ChangeLog:1.3508	Thu Feb  3 17:14:35 2005
+++ kaffe/ChangeLog	Fri Feb  4 10:36:11 2005
@@ -1,3 +1,22 @@
+2005-02-04  Dalibor Topic  <robilad at kaffe.org>
+
+	* kaffe/kaffevm/classMethod.c (retry):
+	Removed unused variables.
+
+	* kaffe/kaffevm/findInJar.c (discoveredClassHome):
+	Only compile in if binreloc is enabled.
+	
+	* kaffe/kaffevm/classPool.c,
+	kaffe/kaffevm/intrp/methodcalls.c,
+	kaffe/kaffevm/intrp/machine.h:
+	Added missing includes.
+
+	* kaffe/kaffevm/jni/jni.c (Kaffe_DestroyJavaVM)
+	Removed NONRETURNING attribute.
+
+	* kaffe/kaffevm/jni/jni_i.h (Kaffe_DestroyJavaVM)
+	Removed prototype.
+	
 2005-02-03  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU Classpath.
Index: kaffe/kaffe/kaffevm/classMethod.c
diff -u kaffe/kaffe/kaffevm/classMethod.c:1.132 kaffe/kaffe/kaffevm/classMethod.c:1.133
--- kaffe/kaffe/kaffevm/classMethod.c:1.132	Sun Jan 30 12:42:40 2005
+++ kaffe/kaffe/kaffevm/classMethod.c	Fri Feb  4 10:36:14 2005
@@ -508,8 +508,6 @@
 	DO_CLASS_STATE(CSTATE_COMPLETE) {
 		jthrowable exc = NULL;
 		jthrowable excpending;
-		JavaVM *vms[1];
-		jsize jniworking;
 
 		/* If we need a successfully initialized class here, but its
 		 * initializer failed, return false as well
Index: kaffe/kaffe/kaffevm/classPool.c
diff -u kaffe/kaffe/kaffevm/classPool.c:1.32 kaffe/kaffe/kaffevm/classPool.c:1.33
--- kaffe/kaffe/kaffevm/classPool.c:1.32	Tue Dec 21 16:51:05 2004
+++ kaffe/kaffe/kaffevm/classPool.c	Fri Feb  4 10:36:14 2005
@@ -14,6 +14,7 @@
 #include "config-std.h"
 #include "config-mem.h"
 #include "errors.h"
+#include "external.h"
 #include "itypes.h"
 #include "access.h"
 #include "file.h"
Index: kaffe/kaffe/kaffevm/findInJar.c
diff -u kaffe/kaffe/kaffevm/findInJar.c:1.64 kaffe/kaffe/kaffevm/findInJar.c:1.65
--- kaffe/kaffe/kaffevm/findInJar.c:1.64	Wed Dec 22 00:22:04 2004
+++ kaffe/kaffe/kaffevm/findInJar.c	Fri Feb  4 10:36:14 2005
@@ -771,7 +771,9 @@
 }
 #endif
 
+#ifdef ENABLE_BINRELOC
 static char discoveredClassHome[MAXPATHLEN];
+#endif
 
 /*
  * Guess the path to kaffe/jre/lib by going upwards from the current
Index: kaffe/kaffe/kaffevm/intrp/machine.h
diff -u kaffe/kaffe/kaffevm/intrp/machine.h:1.10 kaffe/kaffe/kaffevm/intrp/machine.h:1.11
--- kaffe/kaffe/kaffevm/intrp/machine.h:1.10	Sun Feb  1 22:14:53 2004
+++ kaffe/kaffe/kaffevm/intrp/machine.h	Fri Feb  4 10:36:14 2005
@@ -11,6 +11,8 @@
 #ifndef __machine_h
 #define	__machine_h
 
+#include "threadData.h"
+
 #define current_class()		(meth->class)
 
 #define getopcode()             ((int)code[pc])
Index: kaffe/kaffe/kaffevm/intrp/methodcalls.c
diff -u kaffe/kaffe/kaffevm/intrp/methodcalls.c:1.6 kaffe/kaffe/kaffevm/intrp/methodcalls.c:1.7
--- kaffe/kaffe/kaffevm/intrp/methodcalls.c:1.6	Sun Jan 30 12:42:41 2005
+++ kaffe/kaffe/kaffevm/intrp/methodcalls.c	Fri Feb  4 10:36:14 2005
@@ -17,6 +17,9 @@
 #else
 #define NEED_sysdepCallMethod 1
 #endif
+
+#include "locks.h"
+#include "machine.h"
 #include "methodcalls.h"
 #include "thread.h"
 #include "slots.h"
Index: kaffe/kaffe/kaffevm/jni/jni.c
diff -u kaffe/kaffe/kaffevm/jni/jni.c:1.16 kaffe/kaffe/kaffevm/jni/jni.c:1.17
--- kaffe/kaffe/kaffevm/jni/jni.c:1.16	Sun Jan 30 12:42:42 2005
+++ kaffe/kaffe/kaffevm/jni/jni.c	Fri Feb  4 10:36:15 2005
@@ -727,7 +727,6 @@
 }
 
 static jint
-NONRETURNING
 Kaffe_DestroyJavaVM(JavaVM* vm UNUSED)
 {
 	/* Right now, calling this from main2 is what prevents us from 
Index: kaffe/kaffe/kaffevm/jni/jni_i.h
diff -u kaffe/kaffe/kaffevm/jni/jni_i.h:1.6 kaffe/kaffe/kaffevm/jni/jni_i.h:1.7
--- kaffe/kaffe/kaffevm/jni/jni_i.h:1.6	Sun Jan 30 12:42:42 2005
+++ kaffe/kaffe/kaffevm/jni/jni_i.h	Fri Feb  4 10:36:15 2005
@@ -74,7 +74,5 @@
 
 #define	END_EXCEPTION_HANDLING()			\
 	thread_data->exceptPtr = ebuf.prev
-
-extern void NONRETURNING Kaffe_FatalError(JNIEnv* env, const char* mess);
 #endif