Hi list,
I just committed that attached patch to fix up our jni headers in CVS.
Michael
2005-04-21 Michael Koch <[EMAIL PROTECTED]>
* include/gnu_java_nio_charset_iconv_IconvDecoder.h,
include/gnu_java_nio_charset_iconv_IconvEncoder.h:
Regenerated with gcjh from gcc 4.0 branch.
Index: include/gnu_java_nio_charset_iconv_IconvDecoder.h
===================================================================
RCS file:
/cvsroot/classpath/classpath/include/gnu_java_nio_charset_iconv_IconvDecoder.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_nio_charset_iconv_IconvDecoder.h
--- include/gnu_java_nio_charset_iconv_IconvDecoder.h 18 Apr 2005 11:35:13
-0000 1.1
+++ include/gnu_java_nio_charset_iconv_IconvDecoder.h 21 Apr 2005 06:01:13
-0000
@@ -1,18 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_charset_iconv_IconvDecoder__
+#define __gnu_java_nio_charset_iconv_IconvDecoder__
+
#include <jni.h>
-#ifndef _Included_IconvDecoder
-#define _Included_IconvDecoder
+
#ifdef __cplusplus
-extern "C" {
+extern "C"
+{
#endif
-JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv
- (JNIEnv *, jobject, jstring);
-JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_decode
- (JNIEnv *, jobject, jbyteArray, jcharArray, jint,jint,jint,jint);
-JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv
- (JNIEnv *, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_openIconv
(JNIEnv *env, jobject, jstring);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_decode
(JNIEnv *env, jobject, jbyteArray, jcharArray, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvDecoder_closeIconv
(JNIEnv *env, jobject);
#ifdef __cplusplus
}
#endif
-#endif
+
+#endif /* __gnu_java_nio_charset_iconv_IconvDecoder__ */
Index: include/gnu_java_nio_charset_iconv_IconvEncoder.h
===================================================================
RCS file:
/cvsroot/classpath/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_nio_charset_iconv_IconvEncoder.h
--- include/gnu_java_nio_charset_iconv_IconvEncoder.h 18 Apr 2005 11:35:13
-0000 1.1
+++ include/gnu_java_nio_charset_iconv_IconvEncoder.h 21 Apr 2005 06:01:13
-0000
@@ -1,18 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_charset_iconv_IconvEncoder__
+#define __gnu_java_nio_charset_iconv_IconvEncoder__
+
#include <jni.h>
-#ifndef _Included_IconvEncoder
-#define _Included_IconvEncoder
+
#ifdef __cplusplus
-extern "C" {
+extern "C"
+{
#endif
-JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv
- (JNIEnv *, jobject, jstring);
-JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_encode
- (JNIEnv *, jobject, jcharArray, jbyteArray, jint,jint,jint,jint);
-JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv
- (JNIEnv *, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv
(JNIEnv *env, jobject, jstring);
+JNIEXPORT jint JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_encode
(JNIEnv *env, jobject, jcharArray, jbyteArray, jint, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_closeIconv
(JNIEnv *env, jobject);
#ifdef __cplusplus
}
#endif
-#endif
+
+#endif /* __gnu_java_nio_charset_iconv_IconvEncoder__ */
_______________________________________________
Classpath-patches mailing list
Classpath-patches@gnu.org
http://lists.gnu.org/mailman/listinfo/classpath-patches
