Index: include/gnu_java_net_PlainSocketImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_net_PlainSocketImpl.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_net_PlainSocketImpl.h
--- include/gnu_java_net_PlainSocketImpl.h	19 Sep 2003 06:12:39 -0000	1.1
+++ include/gnu_java_net_PlainSocketImpl.h	29 Apr 2004 16:43:47 -0000
@@ -13,7 +13,7 @@
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_setOption (JNIEnv *env, jobject, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_gnu_java_net_PlainSocketImpl_getOption (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_create (JNIEnv *env, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_connect__Ljava_net_InetAddress_2I (JNIEnv *env, jobject, jobject, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_connect (JNIEnv *env, jobject, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_bind (JNIEnv *env, jobject, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_listen (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_accept (JNIEnv *env, jobject, jobject);
Index: include/gnu_java_nio_channels_FileChannelImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_nio_channels_FileChannelImpl.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_nio_channels_FileChannelImpl.h
--- include/gnu_java_nio_channels_FileChannelImpl.h	8 Apr 2004 20:04:13 -0000	1.1
+++ include/gnu_java_nio_channels_FileChannelImpl.h	29 Apr 2004 16:43:47 -0000
@@ -24,7 +24,7 @@
 extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_write___3BII (JNIEnv *env, jobject, jbyteArray, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_write__I (JNIEnv *env, jobject, jint);
 extern JNIEXPORT jobject JNICALL Java_gnu_java_nio_channels_FileChannelImpl_mapImpl (JNIEnv *env, jobject, jchar, jlong, jint);
-extern JNIEXPORT jboolean JNICALL Java_gnu_java_nio_channels_FileChannelImpl_lock__JJZZ (JNIEnv *env, jobject, jlong, jlong, jboolean, jboolean);
+extern JNIEXPORT jboolean JNICALL Java_gnu_java_nio_channels_FileChannelImpl_lock (JNIEnv *env, jobject, jlong, jlong, jboolean, jboolean);
 
 #ifdef __cplusplus
 }
Index: native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_nio_channels_FileChannelImpl.c
--- native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	29 Apr 2004 14:37:06 -0000	1.7
+++ native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	29 Apr 2004 16:43:47 -0000
@@ -648,7 +648,7 @@
 }
 
 JNIEXPORT jboolean JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_lock__JJZZ (JNIEnv *env, jobject obj, jlong position, jlong size, jboolean shared, jboolean wait)
+Java_gnu_java_nio_channels_FileChannelImpl_lock (JNIEnv *env, jobject obj, jlong position, jlong size, jboolean shared, jboolean wait)
 {
   JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.lock(): not implemented");
   return 0;