From: Bruno Haible <bruno@clisp.org>
Date: Sat, 24 Sep 2011 14:43:26 +0000 (+0200)
Subject: read: Fix last commit.
X-Git-Tag: v0.1~1758
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=05f426cf8c26120a84647d00710e8417b8bad064;p=gnulib.git

read: Fix last commit.

* lib/read.c (read_nothrow): Change return type to 'ssize_t'.
---

diff --git a/ChangeLog b/ChangeLog
index c57972e7c..c378e911b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-09-24  Bruno Haible  <bruno@clisp.org>
 
+	read: Fix last commit.
+	* lib/read.c (read_nothrow): Change return type to 'ssize_t'.
+
+2011-09-24  Bruno Haible  <bruno@clisp.org>
+
 	dup2: Fix last commit.
 	* lib/dup2.c: Restore comments. Treat Cygwin like Unix.
 	(rpl_dup2): Disable fcntl workaround on native Windows.
diff --git a/lib/read.c b/lib/read.c
index 98b78012d..1bae3893d 100644
--- a/lib/read.c
+++ b/lib/read.c
@@ -34,10 +34,10 @@
 # undef read
 
 # if HAVE_MSVC_INVALID_PARAMETER_HANDLER
-static inline int
+static inline ssize_t
 read_nothrow (int fd, void *buf, size_t count)
 {
-  int result;
+  ssize_t result;
 
   TRY_MSVC_INVAL
     {