diff options
| author | Roland McGrath <roland@hack.frob.com> | 2014-09-11 16:02:17 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2014-09-11 16:02:17 -0700 |
| commit | 8c0ab919f63dc03a420751172602a52d2bea59a8 (patch) | |
| tree | a196619b2a14716dd6896b2dc26c5719940a0e6a /posix/fnmatch.c | |
| parent | 52ffbdf25a1100986f4ae27bb0febbe5a722ab25 (diff) | |
| download | glibc-8c0ab919f63dc03a420751172602a52d2bea59a8.zip glibc-8c0ab919f63dc03a420751172602a52d2bea59a8.tar.gz glibc-8c0ab919f63dc03a420751172602a52d2bea59a8.tar.bz2 | |
Move findidx nested functions to top-level.
Diffstat (limited to 'posix/fnmatch.c')
| -rw-r--r-- | posix/fnmatch.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/posix/fnmatch.c b/posix/fnmatch.c index c330a12..85a6ec2 100644 --- a/posix/fnmatch.c +++ b/posix/fnmatch.c @@ -221,6 +221,8 @@ __wcschrnul (s, c) # define MEMCHR(S, C, N) memchr (S, C, N) # define STRCOLL(S1, S2) strcoll (S1, S2) # define WIDE_CHAR_VERSION 0 +# include <locale/weight.h> +# define FINDIDX findidx # include "fnmatch_loop.c" @@ -246,6 +248,12 @@ __wcschrnul (s, c) # define MEMCHR(S, C, N) wmemchr (S, C, N) # define STRCOLL(S1, S2) wcscoll (S1, S2) # define WIDE_CHAR_VERSION 1 +/* Change the name the header defines so it doesn't conflict with + the <locale/weight.h> version included above. */ +# define findidx findidxwc +# include <locale/weightwc.h> +# undef findidx +# define FINDIDX findidxwc # undef IS_CHAR_CLASS /* We have to convert the wide character string in a multibyte string. But |