diff options
| author | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-20 16:34:07 +0000 |
|---|---|---|
| committer | schwab <schwab@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-01-20 16:34:07 +0000 |
| commit | 657c6ef9fc9ef206d464e6a097b3f97b194a98e5 (patch) | |
| tree | 522575f3f89210eac3dde10c6b20aa771f0653c4 /libjava | |
| parent | 2360d7e05f21ba1e45a510f4e63e5e85032adfcd (diff) | |
| download | ppe42-gcc-657c6ef9fc9ef206d464e6a097b3f97b194a98e5.tar.gz ppe42-gcc-657c6ef9fc9ef206d464e6a097b3f97b194a98e5.zip | |
* java/net/natPlainSocketImpl.cc (_Jv_recv): Change return type of
function and of parameter recv_func to ssize_t, as specified by
POSIX.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49020 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 55381929690..927619bd2ce 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2002-01-20 Andreas Schwab <schwab@suse.de> + + * java/net/natPlainSocketImpl.cc (_Jv_recv): Change return type of + function and of parameter recv_func to ssize_t, as specified by + POSIX. + 2002-01-19 Per Bothner <per@bothner.com> * java/util/zip/ZipOutputStream.java (putNextEntry): Clear diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index ca294d23f1a..bbd700f05f8 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -72,8 +72,8 @@ _Jv_accept (int fd, struct sockaddr *addr, socklen_t *addrlen) // A wrapper for recv so we don't have to do configure tests. template <typename T_fd, typename T_buf, typename T_len, typename T_flags> -static inline int -_Jv_recv (int (*recv_func) (T_fd s, T_buf buf, T_len len, T_flags flags), +static inline ssize_t +_Jv_recv (ssize_t (*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); |
