From 5c7411981584e487ac41794feb98a66df9fd6fcb Mon Sep 17 00:00:00 2001 From: gandalf Date: Fri, 23 Mar 2012 15:19:26 +0000 Subject: Merge GNU Classpath 0.99 into libjava. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4 --- .../classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h') diff --git a/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h b/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h index f460d0109a9..6d2e7895b33 100644 --- a/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h +++ b/libjava/classpath/include/gnu_java_nio_charset_iconv_IconvEncoder.h @@ -14,6 +14,15 @@ JNIEXPORT void JNICALL Java_gnu_java_nio_charset_iconv_IconvEncoder_openIconv (J 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); +#undef java_nio_charset_CharsetEncoder_STATE_RESET +#define java_nio_charset_CharsetEncoder_STATE_RESET 0L +#undef java_nio_charset_CharsetEncoder_STATE_CODING +#define java_nio_charset_CharsetEncoder_STATE_CODING 1L +#undef java_nio_charset_CharsetEncoder_STATE_END +#define java_nio_charset_CharsetEncoder_STATE_END 2L +#undef java_nio_charset_CharsetEncoder_STATE_FLUSHED +#define java_nio_charset_CharsetEncoder_STATE_FLUSHED 3L + #ifdef __cplusplus } #endif -- cgit v1.2.3