From: Bruno Haible Date: Mon, 1 Oct 2007 22:16:21 +0000 (+0200) Subject: Rename glob_.h to glob.in.h. X-Git-Tag: v0.0~173 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=d68bd41005aef39fe9e8b12f2363a9288758d651;p=gnulib.git Rename glob_.h to glob.in.h. --- diff --git a/ChangeLog b/ChangeLog index 1de03ba88..809e3be96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,11 @@ * lib/fnmatch.in.h: Renamed from lib/fnmatch_.h. * modules/fnmatch (Files, Makefile.am): Use fnmatch.in.h instead of fnmatch_.h. + * lib/getopt.in.h: Renamed from lib/getopt_.h. + * modules/getopt (Files, Makefile.am): Use getopt.in.h instead of + getopt_.h. + * lib/glob.in.h: Renamed from lib/glob_.h. + * modules/glob (Files, Makefile.am): Use glob.in.h instead of glob_.h. 2007-09-30 Bruno Haible diff --git a/lib/glob.in.h b/lib/glob.in.h new file mode 100644 index 000000000..058981780 --- /dev/null +++ b/lib/glob.in.h @@ -0,0 +1,60 @@ +/* glob.h -- Find a path matching a pattern. + + Copyright (C) 2005-2007 Free Software Foundation, Inc. + + Written by Derek Price & Paul Eggert + + 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) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef _GL_GLOB_H +#define _GL_GLOB_H + +#if @HAVE_SYS_CDEFS_H@ +# include +#endif + +#include + +/* On some systems, such as AIX 5.1, does a "#define stat stat64". + Make sure this definition is seen before glob-libc.h defines types that + rely on 'struct stat'. */ +#include + +#ifndef __BEGIN_DECLS +# define __BEGIN_DECLS +# define __END_DECLS +#endif +#ifndef __THROW +# define __THROW +#endif + +#ifndef __size_t +# define __size_t size_t +#endif +#ifndef __USE_GNU +# define __USE_GNU 1 +#endif + + +#define glob rpl_glob +#define globfree rpl_globfree +#define glob_pattern_p rpl_glob_pattern_p + +#define __GLOB_GNULIB 1 + +/* Now the standard GNU C Library header should work. */ +#include "glob-libc.h" + +#endif /* _GL_GLOB_H */ diff --git a/lib/glob_.h b/lib/glob_.h deleted file mode 100644 index 451b111e2..000000000 --- a/lib/glob_.h +++ /dev/null @@ -1,60 +0,0 @@ -/* glob_.h -- Find a path matching a pattern. - - Copyright (C) 2005-2007 Free Software Foundation, Inc. - - Written by Derek Price & Paul Eggert - - 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) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -#ifndef _GL_GLOB_H -#define _GL_GLOB_H - -#if @HAVE_SYS_CDEFS_H@ -# include -#endif - -#include - -/* On some systems, such as AIX 5.1, does a "#define stat stat64". - Make sure this definition is seen before glob-libc.h defines types that - rely on 'struct stat'. */ -#include - -#ifndef __BEGIN_DECLS -# define __BEGIN_DECLS -# define __END_DECLS -#endif -#ifndef __THROW -# define __THROW -#endif - -#ifndef __size_t -# define __size_t size_t -#endif -#ifndef __USE_GNU -# define __USE_GNU 1 -#endif - - -#define glob rpl_glob -#define globfree rpl_globfree -#define glob_pattern_p rpl_glob_pattern_p - -#define __GLOB_GNULIB 1 - -/* Now the standard GNU C Library header should work. */ -#include "glob-libc.h" - -#endif /* _GL_GLOB_H */ diff --git a/modules/glob b/modules/glob index 31173e073..aee245f94 100644 --- a/modules/glob +++ b/modules/glob @@ -3,7 +3,7 @@ glob() function: Search for files and directories with paths matching a pattern, with GNU extensions. Files: -lib/glob_.h +lib/glob.in.h lib/glob-libc.h lib/glob.c m4/glob.m4 @@ -29,10 +29,10 @@ BUILT_SOURCES += $(GLOB_H) # We need the following in order to create when the system # doesn't have one that works with the given compiler. -glob.h: glob_.h +glob.h: glob.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ - < $(srcdir)/glob_.h; \ + < $(srcdir)/glob.in.h; \ } > $@-t mv -f $@-t $@ MOSTLYCLEANFILES += glob.h glob.h-t