diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-09-05 20:47:38 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2006-09-05 20:47:38 +0000 |
| commit | 228fc33f661314b6723b691635085ee4ff6a69b2 (patch) | |
| tree | 50e78696593f8df21fe9330258dff98537d39f65 /native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c | |
| parent | f090c35d5776db64813ccf19d8327cf0ae756ac7 (diff) | |
| download | classpath-228fc33f661314b6723b691635085ee4ff6a69b2.tar.gz | |
2006-09-05 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD-->generics from 2006/08/12 to 2006/09/03.
Diffstat (limited to 'native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c')
| -rw-r--r-- | native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c b/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c index 3d48b9195..fb9855908 100644 --- a/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c +++ b/native/jni/java-net/gnu_java_net_VMPlainSocketImpl.c @@ -45,14 +45,10 @@ exception statement from your version. */ #include <jni.h> #include <jcl.h> +#include <cpnative.h> +#include <cpnet.h> #include "javanet.h" -#include "target_native.h" -#ifndef WITHOUT_NETWORK - #include "target_native_file.h" /* Get FIONREAD on Solaris. */ - #include "target_native_network.h" -#endif /* WITHOUT_NETWORK */ - #include "gnu_java_net_VMPlainSocketImpl.h" /* @@ -195,10 +191,10 @@ Java_gnu_java_net_VMPlainSocketImpl_available(JNIEnv *env, fd = (*env)->GetIntField(env, obj, fid); - TARGET_NATIVE_NETWORK_SOCKET_RECEIVE_AVAILABLE(fd,bytesAvailable,result); - if (result != TARGET_NATIVE_OK) + result = cpnet_getAvailableBytes (env, fd, &bytesAvailable); + if (result != CPNATIVE_OK) { - JCL_ThrowException(env, IO_EXCEPTION, TARGET_NATIVE_LAST_ERROR_STRING()); + JCL_ThrowException(env, IO_EXCEPTION, cpnative_getErrorString (result)); return 0; } @@ -255,7 +251,7 @@ Java_gnu_java_net_VMPlainSocketImpl_read(JNIEnv *env, jint offset, jint len) { #ifndef WITHOUT_NETWORK - return(_javanet_recvfrom(env, obj, buf, offset, len, 0, 0)); + return(_javanet_recvfrom(env, obj, buf, offset, len, 0)); #else /* not WITHOUT_NETWORK */ return 0; #endif /* not WITHOUT_NETWORK */ @@ -273,7 +269,7 @@ Java_gnu_java_net_VMPlainSocketImpl_write(JNIEnv *env, jint offset, jint len) { #ifndef WITHOUT_NETWORK - _javanet_sendto(env, obj, buf, offset, len, 0, 0); + _javanet_sendto(env, obj, buf, offset, len, 0); #else /* not WITHOUT_NETWORK */ #endif /* not WITHOUT_NETWORK */ } |