diff options
| author | Michael Koch <konqueror@gmx.de> | 2004-04-29 16:46:44 +0000 |
|---|---|---|
| committer | Michael Koch <konqueror@gmx.de> | 2004-04-29 16:46:44 +0000 |
| commit | 309d9f2c69480b14000f6ebe0f5fcb818ba28297 (patch) | |
| tree | 3d2278c429506169efe9e55c058709826a1b4c70 | |
| parent | 549e852a7a297325427930638966f339af5952a2 (diff) | |
| download | classpath-309d9f2c69480b14000f6ebe0f5fcb818ba28297.tar.gz | |
2004-04-29 Michael Koch <konqueror@gmx.de>
* include/gnu_java_net_PlainSocketImpl.h
(connect): Fixed signature of method.
* include/gnu_java_nio_channels_FileChannelImpl.h
(lock): Likewise.
* native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
(lock): Likewise.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | include/gnu_java_net_PlainSocketImpl.h | 2 | ||||
| -rw-r--r-- | include/gnu_java_nio_channels_FileChannelImpl.h | 2 | ||||
| -rw-r--r-- | native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c | 2 |
4 files changed, 12 insertions, 3 deletions
@@ -1,3 +1,12 @@ +2004-04-29 Michael Koch <konqueror@gmx.de> + + * include/gnu_java_net_PlainSocketImpl.h + (connect): Fixed signature of method. + * include/gnu_java_nio_channels_FileChannelImpl.h + (lock): Likewise. + * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c + (lock): Likewise. + 2004-04-29 Tom Tromey <tromey@redhat.com> * .classpath: New file. diff --git a/include/gnu_java_net_PlainSocketImpl.h b/include/gnu_java_net_PlainSocketImpl.h index 8601f273a..9c09c2536 100644 --- a/include/gnu_java_net_PlainSocketImpl.h +++ b/include/gnu_java_net_PlainSocketImpl.h @@ -13,7 +13,7 @@ extern "C" 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); diff --git a/include/gnu_java_nio_channels_FileChannelImpl.h b/include/gnu_java_nio_channels_FileChannelImpl.h index a3e1c7e02..be21e56df 100644 --- a/include/gnu_java_nio_channels_FileChannelImpl.h +++ b/include/gnu_java_nio_channels_FileChannelImpl.h @@ -24,7 +24,7 @@ extern JNIEXPORT jint JNICALL Java_gnu_java_nio_channels_FileChannelImpl_read___ 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 } diff --git a/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c b/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c index e60aafbb6..a86fb9399 100644 --- a/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c +++ b/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c @@ -648,7 +648,7 @@ Java_gnu_java_nio_channels_FileChannelImpl_write___3BII (JNIEnv *env, jobject ob } 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; |