diff options
| author | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-08-01 14:23:38 +0530 |
|---|---|---|
| committer | Siddhesh Poyarekar <siddhesh@redhat.com> | 2014-08-01 14:23:38 +0530 |
| commit | 3f3dd810e03661535980e334723666205c693313 (patch) | |
| tree | 353de90ce25d898f9ff72e6cb4a2d4b1ca2f28ff | |
| parent | 95ee7fb13ba99ba265b49531c57e1cb8db629bc6 (diff) | |
| download | glibc-3f3dd810e03661535980e334723666205c693313.tar.gz | |
Fix -Wundef warnings in fnmatch.c
Fixes -Wundef warnings for MBSTATE_T and HAVE_STRING_H. The
HAVE_STRING_H bit is a merge from the gnulib fnmatch.c and the
MBSTATE_T fix has been posted to gnulib for inclusion.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | include/libc-symbols.h | 6 | ||||
| -rw-r--r-- | posix/fnmatch.c | 7 |
3 files changed, 11 insertions, 8 deletions
@@ -1,3 +1,9 @@ +2014-08-01 Siddhesh Poyarekar <siddhesh@redhat.com> + + * include/libc-symbols.h (HAVE_MBSTATE_T): Define macro. + (HAVE_MBSRTOWCS): Likewise. + * posix/fnmatch.c: Include string.h unconditionally. + 2014-08-01 Stefan Liebler <stli@linux.vnet.ibm.com> * NEWS: Explain the s390 jmp_buf / ucontext_t ABI change diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 03061aed9d..d833eb7420 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -57,9 +57,11 @@ so it's harmless. */ #define HAVE_CONFIG_H 0 -/* Define this for the benefit of portable GNU code that wants to check it. - Of course, it's never false when building libc! */ +/* Define these macros for the benefit of portable GNU code that wants to check + them. Of course, STDC_HEADERS is never false when building libc! */ #define STDC_HEADERS 1 +#define HAVE_MBSTATE_T 1 +#define HAVE_MBSRTOWCS 1 /* The symbols in all the user (non-_) macros are C symbols. */ diff --git a/posix/fnmatch.c b/posix/fnmatch.c index ca95ab4df2..c330a122ab 100644 --- a/posix/fnmatch.c +++ b/posix/fnmatch.c @@ -28,12 +28,7 @@ #include <errno.h> #include <fnmatch.h> #include <ctype.h> - -#if HAVE_STRING_H || defined _LIBC -# include <string.h> -#else -# include <strings.h> -#endif +#include <string.h> #if defined STDC_HEADERS || defined _LIBC # include <stdlib.h> |