diff options
| author | Bryce McKinlay <bryce@waitaki.otago.ac.nz> | 2002-03-07 01:53:21 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-03-07 01:53:21 +0000 |
| commit | a72f7227af427cac6e8f53b26e8736b15f8305f1 (patch) | |
| tree | 0c9690b77dad82a55065442f34fb9249ff259606 /libjava/java/net | |
| parent | f2d1ae38790b74c20ddb42a4a20ccef5023e1049 (diff) | |
| download | gcc-a72f7227af427cac6e8f53b26e8736b15f8305f1.zip gcc-a72f7227af427cac6e8f53b26e8736b15f8305f1.tar.gz gcc-a72f7227af427cac6e8f53b26e8736b15f8305f1.tar.bz2 | |
natPlainSocketImpl.cc (_Jv_recv): Removed.
* java/net/natPlainSocketImpl.cc (_Jv_recv): Removed.
(read): Call recv() directly, not _Jv_recv().
From-SVN: r50391
Diffstat (limited to 'libjava/java/net')
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index 4d0ce67..9071430 100644 --- 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()) |