diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2016-12-30 19:21:15 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2017-01-14 18:31:49 +0100 |
commit | 3cc17c2f8c5afcdc6589172bae0535e8606ac00f (patch) | |
tree | 5a6376e55d3f7ff96da97abdbf93649b5f8f5c21 | |
parent | 43a672393627a4b21ebca5e9bf64f93b6ada7c25 (diff) |
fnmatch: fix gcc compiler warnings
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
-rw-r--r-- | libc/misc/fnmatch/fnmatch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libc/misc/fnmatch/fnmatch.c b/libc/misc/fnmatch/fnmatch.c index d54b6e7c7..f9f1cf155 100644 --- a/libc/misc/fnmatch/fnmatch.c +++ b/libc/misc/fnmatch/fnmatch.c @@ -43,7 +43,7 @@ #include <fnmatch.h> #include <ctype.h> -#if HAVE_STRING_H || defined _LIBC +#if defined HAVE_STRING_H || defined _LIBC # include <string.h> #else # include <strings.h> @@ -144,7 +144,7 @@ extern int fnmatch (const char *pattern, const char *string, int flags); # define ISWCTYPE(WC, WT) iswctype (WC, WT) # endif -# if (HAVE_MBSTATE_T && HAVE_MBSRTOWCS) || _LIBC +# if (defined HAVE_MBSTATE_T && defined HAVE_MBSRTOWCS) || defined _LIBC /* In this case we are implementing the multibyte character handling. */ # define HANDLE_MULTIBYTE 1 # endif @@ -190,7 +190,7 @@ __strchrnul (s, c) } # endif -# if HANDLE_MULTIBYTE && !defined HAVE___STRCHRNUL && !defined _LIBC +# if defined HANDLE_MULTIBYTE && !defined HAVE___STRCHRNUL && !defined _LIBC static wchar_t * __wcschrnul (s, c) const wchar_t *s; @@ -235,7 +235,7 @@ __wcschrnul (s, c) # include "fnmatch_loop.c" -# if HANDLE_MULTIBYTE +# if defined HANDLE_MULTIBYTE /* Note that this evaluates C many times. */ # ifdef _LIBC # define FOLD(c) ((flags & FNM_CASEFOLD) ? towlower (c) : (c)) @@ -332,7 +332,7 @@ is_char_class (const wchar_t *wcs) int fnmatch (const char *pattern, const char *string, int flags) { -# if HANDLE_MULTIBYTE +# if defined HANDLE_MULTIBYTE if (__builtin_expect (MB_CUR_MAX, 1) != 1) { mbstate_t ps; |