* 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.

7 files changed, 18 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 049f51c75..3d6515a0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-08-05  Mark Wielaard  <mark@klomp.org>
+
+	* 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.
+
 2005-08-05  Roman Kennke  <roman@kennke.org>
 
 	* java/awt/Container.java:
diff --git a/include/java_nio_VMDirectByteBuffer.h b/include/java_nio_VMDirectByteBuffer.h
index 0615bbc7a..3214d38e3 100644
--- a/include/java_nio_VMDirectByteBuffer.h
+++ b/include/java_nio_VMDirectByteBuffer.h
@@ -10,7 +10,6 @@ extern "C"
 {
 #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);
diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
index 4413f4c36..b64862c65 100644
--- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
+++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c
@@ -35,6 +35,7 @@ this exception to your version of the library, but you are not
 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 @@ static void
 createRawData (JNIEnv * env, jobject obj, void *ptr)
 {
   jclass cls;
-  jmethodID method;
   jobject data;
   jfieldID data_fid;
 
@@ -591,7 +591,6 @@ static void *
 getData (JNIEnv * env, jobject obj)
 {
   jclass cls;
-  jfieldID field;
   jfieldID data_fid;
   jobject data;
 
diff --git a/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c b/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
index 4314cfe72..2541e81ea 100644
--- a/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
+++ b/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c
@@ -173,7 +173,6 @@ static void
 createRawData (JNIEnv * env, jobject obj, void *ptr)
 {
   jclass cls;
-  jmethodID method;
   jobject data;
   jfieldID data_fid;
 
@@ -190,7 +189,6 @@ static void *
 getData (JNIEnv * env, jobject obj)
 {
   jclass cls;
-  jfieldID field;
   jfieldID data_fid;
   jobject data;
 
diff --git a/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c b/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
index d5e08f092..7a98e7eee 100644
--- a/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
+++ b/native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
@@ -173,7 +173,6 @@ static void
 createRawData (JNIEnv * env, jobject obj, void *ptr)
 {
   jclass cls;
-  jmethodID method;
   jobject data;
   jfieldID data_fid;
 
@@ -190,7 +189,6 @@ static void *
 getData (JNIEnv * env, jobject obj)
 {
   jclass cls;
-  jfieldID field;
   jfieldID data_fid;
   jobject data;
 
diff --git a/native/jni/java-nio/java_nio_VMDirectByteBuffer.c b/native/jni/java-nio/java_nio_VMDirectByteBuffer.c
index a56458fc6..06e29906a 100644
--- a/native/jni/java-nio/java_nio_VMDirectByteBuffer.c
+++ b/native/jni/java-nio/java_nio_VMDirectByteBuffer.c
@@ -45,12 +45,6 @@ exception statement from your version. */
 
 #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)
diff --git a/vm/reference/java/nio/VMDirectByteBuffer.java b/vm/reference/java/nio/VMDirectByteBuffer.java
index 9ca89cde5..93a83883a 100644
--- a/vm/reference/java/nio/VMDirectByteBuffer.java
+++ b/vm/reference/java/nio/VMDirectByteBuffer.java
@@ -50,12 +50,8 @@ final class VMDirectByteBuffer
       {
         System.loadLibrary("javanio");
       }
-
-    init();
   }
 
-  private static native void init();
-
   static native Pointer allocate (int capacity);
   static native void free(Pointer address);
   static native byte get(Pointer address, int index);