From d1e7b7e76d2811d622af5698e84d26e48403cbb2 Mon Sep 17 00:00:00 2001
From: Eric Blake <eblake@redhat.com>
Date: Fri, 21 Jan 2011 08:48:39 -0700
Subject: [PATCH] strerror_r-posix: work with glibc 2.13

* lib/strerror_r.c (strerror_r): Fix return type.

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 ChangeLog        | 5 +++++
 lib/strerror_r.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index bdfb3182e..21a0936d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-21  Eric Blake  <eblake@redhat.com>
+
+	strerror_r-posix: work with glibc 2.13
+	* lib/strerror_r.c (strerror_r): Fix return type.
+
 2011-01-21  Pádraig Brady  <P@draigBrady.com>
             Bruno Haible  <bruno@clisp.org>
 
diff --git a/lib/strerror_r.c b/lib/strerror_r.c
index 0cc02889b..57a7e8f72 100644
--- a/lib/strerror_r.c
+++ b/lib/strerror_r.c
@@ -98,7 +98,7 @@ strerror_r (int errnum, char *buf, size_t buflen)
   extern int __xpg_strerror_r (int errnum, char *buf, size_t buflen);
 
   int ret = __xpg_strerror_r (errnum, buf, buflen);
-  return (ret < 0 ? errno : 0);
+  return (ret < 0 ? errno : ret);
 }
 
 #else /* (__GLIBC__ >= 2 || defined __UCLIBC__ ? !HAVE___XPG_STRERROR_R : !HAVE_DECL_STRERROR_R) || EXTEND_STRERROR_R */
-- 
2.11.0