Mercurial > hg > octave-lyh > gnulib-hg
changeset 7938:8911922afa2d
* lib/fnmatch_.h: Readjust white space and comments to match
glibc, to avoid spurious diffs.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Wed, 24 Jan 2007 21:46:44 +0000 |
parents | c9127d50c750 |
children | c8dd726905b5 |
files | ChangeLog lib/fnmatch_.h |
diffstat | 2 files changed, 28 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-01-24 Paul Eggert <eggert@cs.ucla.edu> + + * lib/fnmatch_.h: Readjust white space and comments to match + glibc, to avoid spurious diffs. + 2007-01-23 Paul Eggert <eggert@cs.ucla.edu> * lib/fnmatch_loop.c (internal_fnmatch) [!_LIBC]: #if-out the
--- a/lib/fnmatch_.h +++ b/lib/fnmatch_.h @@ -1,6 +1,8 @@ /* Copyright (C) 1991, 1992, 1993, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2005 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 the Free Software Foundation; either version 2, or (at your option) @@ -16,48 +18,48 @@ 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 +#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 file name pattern PATTERN, returning zero if it matches, FNM_NOMATCH if not. */ extern int fnmatch (const char *__pattern, const char *__name, int __flags); -# ifdef __cplusplus +#ifdef __cplusplus } -# endif +#endif #endif /* fnmatch.h */