Hi, This cleans up some things that prevented compilation with --enable-Werror.
2005-08-05 Mark Wielaard <[EMAIL PROTECTED]>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c: Include
jcl.h.
(createRawData): Removed unused variable method.
(getData): Removed unused variable field.
* native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
(createRawData): Removed unused variable method.
(getData): Removed unused variable field.
* native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
(createRawData): Removed unused variable method.
(getData): Removed unused variable field.
* native/jni/java-nio/java_nio_VMDirectByteBuffer.c
(Java_java_nio_VMDirectByteBuffer_init): Removed.
* vm/reference/java/nio/VMDirectByteBuffer.java (init): Removed.
* include/java_nio_VMDirectByteBuffer.h: Regenerated.
Committed,
Mark
? vm/reference/gnu/classpath/VMStackWalker.java.mark
Index: include/java_nio_VMDirectByteBuffer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_nio_VMDirectByteBuffer.h,v
retrieving revision 1.3
diff -u -r1.3 java_nio_VMDirectByteBuffer.h
--- include/java_nio_VMDirectByteBuffer.h 3 Aug 2005 18:16:17 -0000 1.3
+++ include/java_nio_VMDirectByteBuffer.h 5 Aug 2005 17:10:59 -0000
@@ -10,7 +10,6 @@
{
#endif
-JNIEXPORT void JNICALL Java_java_nio_VMDirectByteBuffer_init (JNIEnv *env, jclass);
JNIEXPORT jobject JNICALL Java_java_nio_VMDirectByteBuffer_allocate (JNIEnv *env, jclass, jint);
JNIEXPORT void JNICALL Java_java_nio_VMDirectByteBuffer_free (JNIEnv *env, jclass, jobject);
JNIEXPORT jbyte JNICALL Java_java_nio_VMDirectByteBuffer_get__Lgnu_classpath_Pointer_2I (JNIEnv *env, jclass, jobject, jint);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c,v
retrieving revision 1.10
diff -u -r1.10 gnu_java_awt_peer_gtk_GtkImage.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c 3 Aug 2005 13:12:59 -0000 1.10
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c 5 Aug 2005 17:10:59 -0000
@@ -35,6 +35,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+#include "jcl.h"
#include "gtkpeer.h"
#include "gnu_java_awt_peer_gtk_GtkImage.h"
#include <gdk-pixbuf/gdk-pixbuf.h>
@@ -573,7 +574,6 @@
createRawData (JNIEnv * env, jobject obj, void *ptr)
{
jclass cls;
- jmethodID method;
jobject data;
jfieldID data_fid;
@@ -591,7 +591,6 @@
getData (JNIEnv * env, jobject obj)
{
jclass cls;
- jfieldID field;
jfieldID data_fid;
jobject data;
Index: native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_nio_charset_iconv_IconvDecoder.c
--- native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c 3 Aug 2005 13:12:59 -0000 1.6
+++ native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c 5 Aug 2005 17:10:59 -0000
@@ -173,7 +173,6 @@
createRawData (JNIEnv * env, jobject obj, void *ptr)
{
jclass cls;
- jmethodID method;
jobject data;
jfieldID data_fid;
@@ -190,7 +189,6 @@
getData (JNIEnv * env, jobject obj)
{
jclass cls;
- jfieldID field;
jfieldID data_fid;
jobject data;
Index: native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_nio_charset_iconv_IconvEncoder.c
--- native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c 3 Aug 2005 18:16:17 -0000 1.7
+++ native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c 5 Aug 2005 17:10:59 -0000
@@ -173,7 +173,6 @@
createRawData (JNIEnv * env, jobject obj, void *ptr)
{
jclass cls;
- jmethodID method;
jobject data;
jfieldID data_fid;
@@ -190,7 +189,6 @@
getData (JNIEnv * env, jobject obj)
{
jclass cls;
- jfieldID field;
jfieldID data_fid;
jobject data;
Index: native/jni/java-nio/java_nio_VMDirectByteBuffer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/java_nio_VMDirectByteBuffer.c,v
retrieving revision 1.10
diff -u -r1.10 java_nio_VMDirectByteBuffer.c
--- native/jni/java-nio/java_nio_VMDirectByteBuffer.c 3 Aug 2005 13:12:59 -0000 1.10
+++ native/jni/java-nio/java_nio_VMDirectByteBuffer.c 5 Aug 2005 17:10:59 -0000
@@ -45,12 +45,6 @@
#include "java_nio_VMDirectByteBuffer.h"
-JNIEXPORT void JNICALL
-Java_java_nio_VMDirectByteBuffer_init
- (JNIEnv * env, jclass clazz __attribute__ ((__unused__)))
-{
-}
-
JNIEXPORT jobject JNICALL
Java_java_nio_VMDirectByteBuffer_allocate
(JNIEnv * env, jclass clazz __attribute__ ((__unused__)), jint capacity)
Index: vm/reference/java/nio/VMDirectByteBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/vm/reference/java/nio/VMDirectByteBuffer.java,v
retrieving revision 1.4
diff -u -r1.4 VMDirectByteBuffer.java
--- vm/reference/java/nio/VMDirectByteBuffer.java 3 Aug 2005 13:12:59 -0000 1.4
+++ vm/reference/java/nio/VMDirectByteBuffer.java 5 Aug 2005 17:10:59 -0000
@@ -50,11 +50,7 @@
{
System.loadLibrary("javanio");
}
-
- init();
}
-
- private static native void init();
static native Pointer allocate (int capacity);
static native void free(Pointer address);
signature.asc
Description: This is a digitally signed message part
_______________________________________________ Classpath-patches mailing list [email protected] http://lists.gnu.org/mailman/listinfo/classpath-patches
