OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natPlainSocketImpl.cc (_Jv_recv): Removed. 

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

From-SVN: r50389
This commit is contained in:
Bryce McKinlay 2002-03-07 01:51:45 +00:00 committed by Bryce McKinlay
parent e524a5d733
commit cafb78f86b
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -1,3 +1,8 @@
2002-02-28 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>
* include/config.h.in: Rebuilt.

11
libjava/java/net/natPlainSocketImpl.cc
View File

@ -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())