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);