X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Ffnmatch_.h;h=b086b45aacf8a77e1eaf787533c00e3bcc515eaf;hb=20229ba96d971f97ff03ab74eeb4e7de1acccf98;hp=5d83ac984baee089883a98005a7d507821aa2e62;hpb=2fe95c09b307df948a34b579a4ebaf2873c91cef;p=gnulib.git

diff --git a/lib/fnmatch_.h b/lib/fnmatch_.h
index 5d83ac984..b086b45aa 100644
--- a/lib/fnmatch_.h
+++ b/lib/fnmatch_.h
@@ -1,5 +1,7 @@
-/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003
-   Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+   2005, 2007 Free Software Foundation, Inc.
+
+   This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -13,64 +15,51 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 #ifndef	_FNMATCH_H
-# define _FNMATCH_H	1
+#define	_FNMATCH_H	1
 
-# ifdef	__cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
-
-# if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
-#  if !defined __GLIBC__ || !defined __P
-#   undef	__P
-#   define __P(protos)	protos
-#  endif
-# else /* Not C++ or ANSI C.  */
-#  undef	__P
-#  define __P(protos)	()
-/* We can get away without defining `const' here only because in this file
-   it is used only inside the prototype for `fnmatch', which is elided in
-   non-ANSI C where `const' is problematical.  */
-# endif /* C++ or ANSI C.  */
+#endif
 
 /* We #undef these before defining them because some losing systems
    (HP-UX A.08.07 for example) define these in <unistd.h>.  */
-# undef	FNM_PATHNAME
-# undef	FNM_NOESCAPE
-# undef	FNM_PERIOD
+#undef	FNM_PATHNAME
+#undef	FNM_NOESCAPE
+#undef	FNM_PERIOD
 
 /* Bits set in the FLAGS argument to `fnmatch'.  */
-# define FNM_PATHNAME	(1 << 0) /* No wildcard can ever match `/'.  */
-# define FNM_NOESCAPE	(1 << 1) /* Backslashes don't quote special chars.  */
-# define FNM_PERIOD	(1 << 2) /* Leading `.' is matched only explicitly.  */
+#define	FNM_PATHNAME	(1 << 0) /* No wildcard can ever match `/'.  */
+#define	FNM_NOESCAPE	(1 << 1) /* Backslashes don't quote special chars.  */
+#define	FNM_PERIOD	(1 << 2) /* Leading `.' is matched only explicitly.  */
 
-# if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU_SOURCE
-#  define FNM_FILE_NAME	 FNM_PATHNAME	/* Preferred GNU name.  */
-#  define FNM_LEADING_DIR (1 << 3)	/* Ignore `/...' after a match.  */
-#  define FNM_CASEFOLD	 (1 << 4)	/* Compare without regard to case.  */
-#  define FNM_EXTMATCH	 (1 << 5)	/* Use ksh-like extended matching. */
-# endif
+#if !defined _POSIX_C_SOURCE || _POSIX_C_SOURCE < 2 || defined _GNU_SOURCE
+# define FNM_FILE_NAME	 FNM_PATHNAME	/* Preferred GNU name.  */
+# define FNM_LEADING_DIR (1 << 3)	/* Ignore `/...' after a match.  */
+# define FNM_CASEFOLD	 (1 << 4)	/* Compare without regard to case.  */
+# define FNM_EXTMATCH	 (1 << 5)	/* Use ksh-like extended matching. */
+#endif
 
 /* Value returned by `fnmatch' if STRING does not match PATTERN.  */
-# define FNM_NOMATCH	1
+#define	FNM_NOMATCH	1
 
 /* This value is returned if the implementation does not support
    `fnmatch'.  Since this is not the case here it will never be
    returned but the conformance test suites still require the symbol
    to be defined.  */
-# ifdef _XOPEN_SOURCE
-#  define FNM_NOSYS	(-1)
-# endif
+#ifdef _XOPEN_SOURCE
+# define FNM_NOSYS	(-1)
+#endif
 
-/* Match NAME against the filename pattern PATTERN,
+/* Match NAME against the file name pattern PATTERN,
    returning zero if it matches, FNM_NOMATCH if not.  */
-extern int fnmatch __P ((const char *__pattern, const char *__name,
-			 int __flags));
+extern int fnmatch (const char *__pattern, const char *__name,
+		    int __flags);
 
-# ifdef	__cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
 
 #endif /* fnmatch.h */