From 464115ce930bbd1a1aa65fe3b03bd39837beb1bf Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 20 Jan 2002 16:34:07 +0000 Subject: [PATCH] natPlainSocketImpl.cc (_Jv_recv): Change return type of function and of parameter recv_func to ssize_t... * java/net/natPlainSocketImpl.cc (_Jv_recv): Change return type of function and of parameter recv_func to ssize_t, as specified by POSIX. From-SVN: r49020 --- libjava/ChangeLog | 6 ++++++ 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 + + * 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 * 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 -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);