# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1307278636 -7200
# Node ID 3b0e2e72c0a29da3c6e4a14d14cfbdf5da1cd4dd
# Parent  355e7137b2def81c304337e18f63a357ede270ee
error: Avoid gcc warning.

* lib/error.c (strerror_r): Declare also when its return type is 'int'.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-05  Bruno Haible  <bruno@clisp.org>
+
+	error: Avoid gcc warning.
+	* lib/error.c (strerror_r): Declare also when its return type is 'int'.
+
 2011-06-05  Bruno Haible  <bruno@clisp.org>
 
 	unsetenv: Avoid gcc warning.
diff --git a/lib/error.c b/lib/error.c
--- a/lib/error.c
+++ b/lib/error.c
@@ -97,11 +97,15 @@
 /* The gnulib override of fcntl is not needed in this file.  */
 # undef fcntl
 
-# if !HAVE_DECL_STRERROR_R && STRERROR_R_CHAR_P
+# if !HAVE_DECL_STRERROR_R
 #  ifndef HAVE_DECL_STRERROR_R
 "this configure-time declaration test was not run"
 #  endif
+#  if STRERROR_R_CHAR_P
 char *strerror_r ();
+#  else
+int strerror_r ();
+#  endif
 # endif
 
 /* The calling program should define program_name and set it to the