natPlainSocketImpl.cc (_Jv_recv): Removed.

	* java/net/natPlainSocketImpl.cc (_Jv_recv): Removed.
	(read): Call recv() directly, not _Jv_recv().

From-SVN: r50391

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6de0a688728d9b9690787b42df1808868c1a259b..ef0022ec32b5dade0c1ac898ebf472adc956d1e4 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-07  Bryce McKinlay  <bryce@waitaki.otago.ac.nz>
+
+       * java/net/natPlainSocketImpl.cc (_Jv_recv): Removed.
+       (read): Call recv() directly, not _Jv_recv().
+
 2002-03-06  Tom Tromey  <tromey@redhat.com>
 
        * java/io/natFileDescriptorEcos.cc (init): Don't use

diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index 4d0ce677d6d8cb0046acb20d6e3c0b92bbb57b87..907143019fb7e4448ec5d1ae0dde33b26bfca9b6 100644 (file)
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -72,15 +72,6 @@ _Jv_accept (int fd, struct sockaddr *addr, socklen_t *addrlen)
 #undef accept
 #endif
 
-// A wrapper for recv so we don't have to do configure tests.
-template <typename T_ret, typename T_fd, typename T_buf,
-          typename T_len, typename T_flags>
-static inline ssize_t
-_Jv_recv (T_ret (*recv_func) (T_fd s, T_buf buf, T_len len, T_flags flags),
-         int s, void *buf, size_t len, int flags)
-{
-  return recv_func ((T_fd) s, (T_buf) buf, (T_len) len, (T_flags) flags);
-}
 #endif /* DISABLE_JAVA_NET */
 
 #include <gcj/cni.h>
@@ -551,7 +542,7 @@ java::net::PlainSocketImpl::read(jbyteArray buffer, jint offset, jint count)
       }
   }
   // Read the socket.
-  int r = _Jv_recv (::recv, fnum, (void *) bytes, count, 0);
+  int r = ::recv (fnum, (char *) bytes, count, 0);
   if (r == 0)
     return -1;
   if (java::lang::Thread::interrupted())