svn commit: trunk/uClibc/include

psm at uclibc.org psm at uclibc.org
Thu Dec 8 18:57:20 UTC 2005


Author: psm
Date: 2005-12-08 10:56:57 -0800 (Thu, 08 Dec 2005)
New Revision: 12752

Log:
Sync w/ glibc

Modified:
   trunk/uClibc/include/fnmatch.h


Changeset:
Modified: trunk/uClibc/include/fnmatch.h
===================================================================
--- trunk/uClibc/include/fnmatch.h	2005-12-08 18:48:20 UTC (rev 12751)
+++ trunk/uClibc/include/fnmatch.h	2005-12-08 18:56:57 UTC (rev 12752)
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,96,97,98,99,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1991-93,96,97,98,99,2001,2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -23,19 +23,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
 # if (defined __STDC__ && __STDC__) || defined __cplusplus
 #  define __const	const
@@ -75,8 +62,8 @@
 
 /* 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
 }




More information about the uClibc-cvs mailing list