2006-10-29 Andrew John Hughes <gnu_andrew@member.fsf.org>

	* Merge of HEAD --> generics for 2006/10/04-2006/10/29.

1 files changed, 28 insertions, 141 deletions

diff --git a/include/gnu_java_net_VMPlainSocketImpl.h b/include/gnu_java_net_VMPlainSocketImpl.h
index b274ce0fb..ef3c3a467 100644
--- a/include/gnu_java_net_VMPlainSocketImpl.h
+++ b/include/gnu_java_net_VMPlainSocketImpl.h
@@ -1,152 +1,39 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_net_VMPlainSocketImpl__
+#define __gnu_java_net_VMPlainSocketImpl__
+
 #include <jni.h>
-/* Header for class gnu_java_net_VMPlainSocketImpl */
 
-#ifndef _Included_gnu_java_net_VMPlainSocketImpl
-#define _Included_gnu_java_net_VMPlainSocketImpl
 #ifdef __cplusplus
-extern "C" {
+extern "C"
+{
 #endif
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    setOption
- * Signature: (III)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_setOption
-  (JNIEnv *, jclass, jint, jint, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    getOption
- * Signature: (II)I
- */
-JNIEXPORT jint JNICALL Java_gnu_java_net_VMPlainSocketImpl_getOption
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    bind
- * Signature: (I[BI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_bind
-  (JNIEnv *, jclass, jint, jbyteArray, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    bind6
- * Signature: (I[BI)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_bind6
-  (JNIEnv *, jclass, jint, jbyteArray, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    listen
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_listen
-  (JNIEnv *, jclass, jint, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    join
- * Signature: (I[B)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_join
-  (JNIEnv *, jclass, jint, jbyteArray);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    join6
- * Signature: (I[B)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_join6
-  (JNIEnv *, jclass, jint, jbyteArray);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    leave
- * Signature: (I[B)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leave
-  (JNIEnv *, jclass, jint, jbyteArray);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    leave6
- * Signature: (I[B)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leave6
-  (JNIEnv *, jclass, jint, jbyteArray);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    joinGroup
- * Signature: (I[BLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_joinGroup
-  (JNIEnv *, jclass, jint, jbyteArray, jstring);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    joinGroup6
- * Signature: (I[BLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_joinGroup6
-  (JNIEnv *, jclass, jint, jbyteArray, jstring);
 
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    leaveGroup
- * Signature: (I[BLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leaveGroup
-  (JNIEnv *, jclass, jint, jbyteArray, jstring);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    leaveGroup6
- * Signature: (I[BLjava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leaveGroup6
-  (JNIEnv *, jclass, jint, jbyteArray, jstring);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    shutdownInput
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownInput
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    shutdownOutput
- * Signature: (I)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput
-  (JNIEnv *, jclass, jint);
-
-/*
- * Class:     gnu_java_net_VMPlainSocketImpl
- * Method:    sendUrgentData
- * Signature: (II)V
- */
-JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_sendUrgentData
-  (JNIEnv *, jclass, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_setOption (JNIEnv *env, jclass, jint, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_setMulticastInterface (JNIEnv *env, jclass, jint, jint, jobject);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_setMulticastInterface6 (JNIEnv *env, jclass, jint, jint, jstring);
+JNIEXPORT jint JNICALL Java_gnu_java_net_VMPlainSocketImpl_getOption (JNIEnv *env, jclass, jint, jint);
+JNIEXPORT jobject JNICALL Java_gnu_java_net_VMPlainSocketImpl_getMulticastInterface (JNIEnv *env, jclass, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_bind (JNIEnv *env, jclass, jint, jbyteArray, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_bind6 (JNIEnv *env, jclass, jint, jbyteArray, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_listen (JNIEnv *env, jclass, jint, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_join (JNIEnv *env, jclass, jint, jbyteArray);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_join6 (JNIEnv *env, jclass, jint, jbyteArray);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leave (JNIEnv *env, jclass, jint, jbyteArray);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leave6 (JNIEnv *env, jclass, jint, jbyteArray);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_joinGroup (JNIEnv *env, jclass, jint, jbyteArray, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_joinGroup6 (JNIEnv *env, jclass, jint, jbyteArray, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leaveGroup (JNIEnv *env, jclass, jint, jbyteArray, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_leaveGroup6 (JNIEnv *env, jclass, jint, jbyteArray, jstring);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownInput (JNIEnv *env, jclass, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_shutdownOutput (JNIEnv *env, jclass, jint);
+JNIEXPORT void JNICALL Java_gnu_java_net_VMPlainSocketImpl_sendUrgentData (JNIEnv *env, jclass, jint, jint);
+#undef gnu_java_net_VMPlainSocketImpl_CP_IP_TTL
+#define gnu_java_net_VMPlainSocketImpl_CP_IP_TTL 7777L
 
 #ifdef __cplusplus
 }
 #endif
-#endif
-/* Header for class gnu_java_net_VMPlainSocketImpl_State */
 
-#ifndef _Included_gnu_java_net_VMPlainSocketImpl_State
-#define _Included_gnu_java_net_VMPlainSocketImpl_State
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
+#endif /* __gnu_java_net_VMPlainSocketImpl__ */