Mercurial > hg > octave-nkf > gnulib-hg
changeset 9246:eb22327879c5
Rename dirent_.h to dirent.in.h.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Tue, 02 Oct 2007 00:08:48 +0200 |
parents | de761f780257 |
children | dc86ef955b9b |
files | ChangeLog lib/dirent.in.h lib/dirent_.h modules/fchdir |
diffstat | 4 files changed, 52 insertions(+), 49 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ * lib/byteswap.in.h: Renamed from lib/byteswap_.h. * modules/byteswap (Files, Makefile.am): Use byteswap.in.h instead of byteswap_.h. + * lib/dirent.in.h: Renamed from lib/dirent_.h. + * modules/fchdir (Files, Makefile.am): Use dirent.in.h instead of + dirent_.h. 2007-09-30 Bruno Haible <bruno@clisp.org>
new file mode 100644 --- /dev/null +++ b/lib/dirent.in.h @@ -0,0 +1,46 @@ +/* Wrapper around <dirent.h>. + Copyright (C) 2006-2007 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 + 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_DIRENT_H + +/* The include_next requires a split double-inclusion guard. */ +#@INCLUDE_NEXT@ @NEXT_DIRENT_H@ + +#ifndef _GL_DIRENT_H +#define _GL_DIRENT_H + + +/* Declare overridden functions. */ + +#ifdef __cplusplus +extern "C" { +#endif + +#if @REPLACE_FCHDIR@ +# define opendir rpl_opendir +extern DIR * opendir (const char *); +# define closedir rpl_closedir +extern int closedir (DIR *); +#endif + +#ifdef __cplusplus +} +#endif + + +#endif /* _GL_DIRENT_H */ +#endif /* _GL_DIRENT_H */
deleted file mode 100644 --- a/lib/dirent_.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Wrapper around <dirent.h>. - Copyright (C) 2006-2007 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 - 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_DIRENT_H - -/* The include_next requires a split double-inclusion guard. */ -#@INCLUDE_NEXT@ @NEXT_DIRENT_H@ - -#ifndef _GL_DIRENT_H -#define _GL_DIRENT_H - - -/* Declare overridden functions. */ - -#ifdef __cplusplus -extern "C" { -#endif - -#if @REPLACE_FCHDIR@ -# define opendir rpl_opendir -extern DIR * opendir (const char *); -# define closedir rpl_closedir -extern int closedir (DIR *); -#endif - -#ifdef __cplusplus -} -#endif - - -#endif /* _GL_DIRENT_H */ -#endif /* _GL_DIRENT_H */
--- a/modules/fchdir +++ b/modules/fchdir @@ -3,7 +3,7 @@ Files: lib/fchdir.c -lib/dirent_.h +lib/dirent.in.h m4/fchdir.m4 Depends-on: @@ -24,13 +24,13 @@ # We need the following in order to create <dirent.h> when the system # doesn't have one that works with the given compiler. -dirent.h: dirent_.h +dirent.h: dirent.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ - < $(srcdir)/dirent_.h; \ + < $(srcdir)/dirent.in.h; \ } > $@-t mv $@-t $@ MOSTLYCLEANFILES += dirent.h dirent.h-t