Update from libc.

[gnulib.git] / lib / fnmatch.c

diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 7ec417d..eb45e01 100644 (file)
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -40,12 +40,12 @@
 
 
 # if defined STDC_HEADERS || !defined isascii
-#  define ISASCII(c) 1
+#  define IN_CTYPE_DOMAIN(c) 1
 # else
-#  define ISASCII(c) isascii(c)
+#  define IN_CTYPE_DOMAIN(c) isascii(c)
 # endif
 
-# define ISUPPER(c) (ISASCII (c) && isupper (c))
+# define ISUPPER(c) (IN_CTYPE_DOMAIN (c) && isupper (c))
 
 
 # ifndef errno
@@ -55,10 +55,7 @@ extern int errno;
 /* Match STRING against the filename pattern PATTERN, returning zero if
    it matches, nonzero if not.  */
 int
-fnmatch (pattern, string, flags)
-     const char *pattern;
-     const char *string;
-     int flags;
+fnmatch (const char *pattern, const char *string, int flags)
 {
   register const char *p = pattern, *n = string;
   register char c;