2007-04-05 Christian Thalinger <twisti@complang.tuwien.ac.at>

	* native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c,
	native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
	[HAVE_ICONV] (createRawData, getData, infid, outfid): Added
	#ifdef.
	(openIconv): Added UNUSED argument attribute, so we can build with
	-Werror.
	(decode): Likewise.
	(closeIconv): Likewise.

3 files changed, 47 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index 948f51f30..519a0c63b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-04-05  Christian Thalinger  <twisti@complang.tuwien.ac.at>
+
+	* native/jni/java-nio/gnu_java_nio_charset_iconv_IconvDecoder.c,
+	native/jni/java-nio/gnu_java_nio_charset_iconv_IconvEncoder.c
+	[HAVE_ICONV] (createRawData, getData, infid, outfid): Added
+	#ifdef.
+	(openIconv): Added UNUSED argument attribute, so we can build with
+	-Werror.
+	(decode): Likewise.
+	(closeIconv): Likewise.
+
 2007-04-05  Mark Wielaard  <mark@klomp.org>
 
 	* autogen.sh: Recognize automake 1.10.
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 b82cd2d90..248a948c3 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
@@ -48,11 +48,13 @@ exception statement from your version. */
 
 #include "gnu_java_nio_charset_iconv_IconvDecoder.h"
 
+#if defined(HAVE_ICONV)
 static void createRawData (JNIEnv * env, jobject obj, void *ptr);
 static void *getData (JNIEnv * env, jobject obj);
 
 static jfieldID infid = NULL;
 static jfieldID outfid = NULL;
+#endif
 
 /* Union used for type punning. */
 union char_union
@@ -63,9 +65,9 @@ union char_union
 };
 
 JNIEXPORT void JNICALL
-Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv (JNIEnv * env,
-							jobject obj,
-							jstring jname)
+Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv (JNIEnv * env UNUSED,
+							jobject obj UNUSED,
+							jstring jname UNUSED)
 {
 #if defined(HAVE_ICONV)
   iconv_t iconv_object;
@@ -107,12 +109,14 @@ Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv (JNIEnv * env,
 }
 
 JNIEXPORT jint JNICALL
-Java_gnu_java_nio_charset_iconv_IconvDecoder_decode (JNIEnv * env,
-						     jobject obj,
-						     jbyteArray inArr,
-						     jcharArray outArr,
-						     jint posIn, jint remIn,
-						     jint posOut, jint remOut)
+Java_gnu_java_nio_charset_iconv_IconvDecoder_decode (JNIEnv * env UNUSED,
+						     jobject obj UNUSED,
+						     jbyteArray inArr UNUSED,
+						     jcharArray outArr UNUSED,
+						     jint posIn UNUSED,
+                                                     jint remIn UNUSED,
+						     jint posOut UNUSED,
+                                                     jint remOut UNUSED)
 {
 #if defined(HAVE_ICONV)
   iconv_t iconv_object = getData (env, obj);
@@ -158,8 +162,8 @@ Java_gnu_java_nio_charset_iconv_IconvDecoder_decode (JNIEnv * env,
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv (JNIEnv * env,
-							 jobject obj)
+Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv (JNIEnv * env UNUSED,
+							 jobject obj UNUSED)
 {
 #if defined(HAVE_ICONV)
   iconv_t iconv_object;
@@ -169,6 +173,7 @@ Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv (JNIEnv * env,
 }
 
 
+#if defined(HAVE_ICONV)
 static void
 createRawData (JNIEnv * env, jobject obj, void *ptr)
 {
@@ -199,3 +204,5 @@ getData (JNIEnv * env, jobject obj)
 
   return JCL_GetRawData(env, data);
 }
+#endif
+
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 7a98e7eee..54fd17286 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
@@ -48,11 +48,14 @@ exception statement from your version. */
 
 #include "gnu_java_nio_charset_iconv_IconvEncoder.h"
 
+
+#if defined(HAVE_ICONV)
 static void createRawData (JNIEnv * env, jobject obj, void *ptr);
 static void *getData (JNIEnv * env, jobject obj);
 
 static jfieldID infid = NULL;
 static jfieldID outfid = NULL;
+#endif
 
 /* Union used for type punning. */
 union char_union
@@ -63,9 +66,9 @@ union char_union
 };
 
 JNIEXPORT void JNICALL
-Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv (JNIEnv * env,
-							jobject obj,
-							jstring jname)
+Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv (JNIEnv * env UNUSED,
+							jobject obj UNUSED,
+							jstring jname UNUSED)
 {
 #if defined(HAVE_ICONV)
   iconv_t iconv_object;
@@ -107,12 +110,14 @@ Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv (JNIEnv * env,
 }
 
 JNIEXPORT jint JNICALL
-Java_gnu_java_nio_charset_iconv_IconvEncoder_encode (JNIEnv * env,
-						     jobject obj,
-						     jcharArray inArr,
-						     jbyteArray outArr,
-						     jint posIn, jint remIn,
-						     jint posOut, jint remOut)
+Java_gnu_java_nio_charset_iconv_IconvEncoder_encode (JNIEnv * env UNUSED,
+						     jobject obj UNUSED,
+						     jcharArray inArr UNUSED,
+						     jbyteArray outArr UNUSED,
+						     jint posIn UNUSED,
+                                                     jint remIn UNUSED,
+						     jint posOut UNUSED,
+                                                     jint remOut UNUSED)
 {
 #if defined(HAVE_ICONV)
   iconv_t iconv_object = getData (env, obj);
@@ -158,8 +163,8 @@ Java_gnu_java_nio_charset_iconv_IconvEncoder_encode (JNIEnv * env,
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv (JNIEnv * env,
-							 jobject obj)
+Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv (JNIEnv * env UNUSED,
+							 jobject obj UNUSED)
 {
 #if defined(HAVE_ICONV)
   iconv_t iconv_object;
@@ -169,6 +174,7 @@ Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv (JNIEnv * env,
 }
 
 
+#if defined(HAVE_ICONV)
 static void
 createRawData (JNIEnv * env, jobject obj, void *ptr)
 {
@@ -199,3 +205,4 @@ getData (JNIEnv * env, jobject obj)
 
   return JCL_GetRawData(env, data);
 }
+#endif