projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lib/mempcpy.c: Include <config.h> before <string.h>.
[gnulib.git]
/
lib
/
fnmatch.c
diff --git
a/lib/fnmatch.c
b/lib/fnmatch.c
index
4fc19b4
..
02dd365
100644
(file)
--- a/
lib/fnmatch.c
+++ b/
lib/fnmatch.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
+/* Copyright (C) 1991,1992,1993,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006
,2007
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-15,7
+15,7
@@
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#if
def HAVE_CONFIG_H
+#if
ndef _LIBC
# include <config.h>
#endif
# include <config.h>
#endif
@@
-40,15
+40,14
@@
#include <string.h>
#define WIDE_CHAR_SUPPORT \
#include <string.h>
#define WIDE_CHAR_SUPPORT \
- (HAVE_WCTYPE_H && HAVE_
WCHAR_H && HAVE_BTOWC
\
+ (HAVE_WCTYPE_H && HAVE_
BTOWC && HAVE_ISWCTYPE
\
&& HAVE_WMEMCHR && (HAVE_WMEMCPY || HAVE_WMEMPCPY))
/* For platform which support the ISO C amendement 1 functionality we
support user defined character classes. */
#if defined _LIBC || WIDE_CHAR_SUPPORT
&& HAVE_WMEMCHR && (HAVE_WMEMCPY || HAVE_WMEMPCPY))
/* For platform which support the ISO C amendement 1 functionality we
support user defined character classes. */
#if defined _LIBC || WIDE_CHAR_SUPPORT
-/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. */
-# include <wchar.h>
# include <wctype.h>
# include <wctype.h>
+# include <wchar.h>
#endif
/* We need some of the locale data (the collation sequence information)
#endif
/* We need some of the locale data (the collation sequence information)
@@
-86,15
+85,8
@@
extern int fnmatch (const char *pattern, const char *string, int flags);
#if defined _LIBC || !defined __GNU_LIBRARY__ || !HAVE_FNMATCH_GNU
#if defined _LIBC || !defined __GNU_LIBRARY__ || !HAVE_FNMATCH_GNU
-# ifdef isblank
-# define ISBLANK(c) isblank (c)
-# else
-# define ISBLANK(c) ((c) == ' ' || (c) == '\t')
-# endif
-# ifdef isgraph
-# define ISGRAPH(c) isgraph (c)
-# else
-# define ISGRAPH(c) (isprint (c) && !isspace (c))
+# if ! (defined isblank || HAVE_DECL_ISBLANK)
+# define isblank(c) ((c) == ' ' || (c) == '\t')
# endif
# define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
# endif
# define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
@@
-152,11
+144,7
@@
static int posixly_correct;
# endif
/* Note that this evaluates C many times. */
# endif
/* Note that this evaluates C many times. */
-# ifdef _LIBC
-# define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c))
-# else
-# define FOLD(c) ((flags & FNM_CASEFOLD) && ISUPPER (c) ? tolower (c) : (c))
-# endif
+# define FOLD(c) ((flags & FNM_CASEFOLD) ? tolower (c) : (c))
# define CHAR char
# define UCHAR unsigned char
# define INT int
# define CHAR char
# define UCHAR unsigned char
# define INT int