From: Siddhesh Poyarekar Date: Wed, 9 Jul 2014 09:56:49 +0000 (+0530) Subject: Define macros for glibc X-Git-Tag: v1.0~7339 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=903f8952df434826262da5ef0218d9e50423863a;p=gnulib.git Define macros for glibc This patch helps build error.c without warnings on glibc. error: Fix -Wundef warnings in glibc * lib/error.c [_LIBC]: Define default macros for glibc. (print_errno_message) [defined HAVE_STRERROR_R || _LIBC]: Check _LIBC before STRERROR_R_CHAR_P. --- diff --git a/ChangeLog b/ChangeLog index c310fedcb5..1de9b52e48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2014-07-10 Siddhesh Poyarekar + error: Fix -Wundef warnings in glibc + * lib/error.c [_LIBC]: Define default macros for + glibc. + (print_errno_message) [defined HAVE_STRERROR_R || _LIBC]: + Check _LIBC before STRERROR_R_CHAR_P. + error: Sync from glibc master * lib/error.c [_LIBC]: Remove INTUSE usage. (error_tail): Remove unused macro ALLOCA_LIMIT. diff --git a/lib/error.c b/lib/error.c index 9a3525a882..7b99cd7310 100644 --- a/lib/error.c +++ b/lib/error.c @@ -39,6 +39,9 @@ # include # include # define mbsrtowcs __mbsrtowcs +# define USE_UNLOCKED_IO 0 +# define _GL_ATTRIBUTE_FORMAT_PRINTF(a, b) +# define _GL_ARG_NONNULL(a) #endif #if USE_UNLOCKED_IO @@ -171,7 +174,7 @@ print_errno_message (int errnum) #if defined HAVE_STRERROR_R || _LIBC char errbuf[1024]; -# if STRERROR_R_CHAR_P || _LIBC +# if _LIBC || STRERROR_R_CHAR_P s = __strerror_r (errnum, errbuf, sizeof errbuf); # else if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)