From 89214de3cc8bb95a5c51154cf7515ac0133c8e4b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 5 Jun 2011 14:57:16 +0200 Subject: [PATCH] error: Avoid gcc warning. * lib/error.c (strerror_r): Declare also when its return type is 'int'. --- ChangeLog | 5 +++++ lib/error.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d41786cb9..54373d39f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2011-06-05 Bruno Haible + error: Avoid gcc warning. + * lib/error.c (strerror_r): Declare also when its return type is 'int'. + +2011-06-05 Bruno Haible + unsetenv: Avoid gcc warning. * lib/unsetenv.c (unsetenv): Provide declaration if system lacks it. diff --git a/lib/error.c b/lib/error.c index a2d1c1be3..7482baacf 100644 --- a/lib/error.c +++ b/lib/error.c @@ -97,11 +97,15 @@ extern void __error_at_line (int status, int errnum, const char *file_name, /* 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 -- 2.11.0