Include unlocked-io.h. Remove unnecessary block of defines.

[gnulib.git] / lib / fnmatch_.h

diff --git a/lib/fnmatch_.h b/lib/fnmatch_.h
index 31347e2..fecada5 100644 (file)
--- a/lib/fnmatch_.h
+++ b/lib/fnmatch_.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002
-   Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+   2005 Free Software Foundation, Inc.
 
    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,7 +13,7 @@
 
    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
@@ -22,23 +22,6 @@
 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.  */
-
-# ifndef __const
-#  define __const const
-# 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
@@ -68,10 +51,10 @@ extern "C" {
 #  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
 }