X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffnmatch_.h;h=87e661f725b49d6524579bc1e27e8d7cf03a2a50;hb=ec354b13bec21d8510dd60e1e129cc194809248b;hp=31347e2c701f039d2992d16de91ea2a01348cd37;hpb=1d2f92589b7e0a9c5795ebdbf2bdbc396e55e762;p=gnulib.git diff --git a/lib/fnmatch_.h b/lib/fnmatch_.h index 31347e2c7..87e661f72 100644 --- a/lib/fnmatch_.h +++ b/lib/fnmatch_.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002 +/* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -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 . */ # undef FNM_PATHNAME @@ -70,8 +53,8 @@ extern "C" { /* Match NAME against the filename 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 }