Mercurial > hg > octave-nkf > gnulib-hg
changeset 8825:4a3d91f9b45b
* lib/dirent_.h: Prefer #include_next <foo.h> to #include
@ABSOLUTE_FOO_H@ if @HAVE_INCLUDE_NEXT@. This works better with
GCC 4.2, which otherwise issues a lot of warnings.
* lib/iconv_.h, lib/locale_.h, lib/netinet_in_.h, lib/sys_select_.h:
* lib/sys_socket_.h, lib/sys_stat_.h, lib/sysexits_.h, lib/unistd_.h:
Likewise.
* modules/fchdir (dirent.h): Substitute @HAVE_INCLUDE_NEXT@.
* modules/iconv_open (iconv.h): Likewise.
* modules/locale (locale.h): Likewise.
* modules/netinet_in (netinet/in.h): Likewise.
* modules/sys_select (sys_select.h): Likewise.
* modules/sys_socket (sys/socket.h): Likewise.
* modules/sys_stat (sys/stat.h): Likewise.
* modules/sysexits (sysexits.h): Likewise.
* modules/unistd (unistd.h): Likewise.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Thu, 17 May 2007 15:56:05 +0000 |
parents | 74f6252514c1 |
children | e4a5ce1846d4 |
files | ChangeLog lib/dirent_.h lib/iconv_.h lib/locale_.h lib/netinet_in_.h lib/sys_select_.h lib/sys_socket_.h lib/sys_stat_.h lib/sysexits_.h lib/unistd_.h modules/fchdir modules/iconv_open modules/locale modules/netinet_in modules/sys_select modules/sys_socket modules/sys_stat modules/sysexits modules/unistd |
diffstat | 19 files changed, 75 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2007-05-17 Paul Eggert <eggert@cs.ucla.edu> + + * lib/dirent_.h: Prefer #include_next <foo.h> to #include + @ABSOLUTE_FOO_H@ if @HAVE_INCLUDE_NEXT@. This works better with + GCC 4.2, which otherwise issues a lot of warnings. + * lib/iconv_.h, lib/locale_.h, lib/netinet_in_.h, lib/sys_select_.h: + * lib/sys_socket_.h, lib/sys_stat_.h, lib/sysexits_.h, lib/unistd_.h: + Likewise. + * modules/fchdir (dirent.h): Substitute @HAVE_INCLUDE_NEXT@. + * modules/iconv_open (iconv.h): Likewise. + * modules/locale (locale.h): Likewise. + * modules/netinet_in (netinet/in.h): Likewise. + * modules/sys_select (sys_select.h): Likewise. + * modules/sys_socket (sys/socket.h): Likewise. + * modules/sys_stat (sys/stat.h): Likewise. + * modules/sysexits (sysexits.h): Likewise. + * modules/unistd (unistd.h): Likewise. + 2007-05-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * modules/closein-tests (Makefile.am): Distribute
--- a/lib/dirent_.h +++ b/lib/dirent_.h @@ -18,8 +18,11 @@ #ifndef _GL_DIRENT_H #define _GL_DIRENT_H -#include @ABSOLUTE_DIRENT_H@ - +#if @HAVE_INCLUDE_NEXT@ +# include_next <dirent.h> +#else +# include @ABSOLUTE_DIRENT_H@ +#endif /* Declare overridden functions. */
--- a/lib/iconv_.h +++ b/lib/iconv_.h @@ -19,8 +19,11 @@ #ifndef _GL_ICONV_H #define _GL_ICONV_H -#include @ABSOLUTE_ICONV_H@ - +#if @HAVE_INCLUDE_NEXT@ +# include_next <iconv.h> +#else +# include @ABSOLUTE_ICONV_H@ +#endif #ifdef __cplusplus extern "C" {
--- a/lib/locale_.h +++ b/lib/locale_.h @@ -18,7 +18,11 @@ #ifndef _GL_LOCALE_H #define _GL_LOCALE_H -#include @ABSOLUTE_LOCALE_H@ +#if @HAVE_INCLUDE_NEXT@ +# include_next <locale.h> +#else +# include @ABSOLUTE_LOCALE_H@ +#endif /* The LC_MESSAGES locale category is specified in POSIX, but not in ISO C. On systems that don't define it, use the same value as GNU libintl. */
--- a/lib/netinet_in_.h +++ b/lib/netinet_in_.h @@ -24,8 +24,11 @@ <sys/types.h>. */ # include <sys/types.h> -# include @ABSOLUTE_NETINET_IN_H@ - +# if @HAVE_INCLUDE_NEXT@ +# include_next <netinet/in.h> +# else +# include @ABSOLUTE_NETINET_IN_H@ +# endif #else /* A platform that lacks <netinet/in.h>. */
--- a/lib/sys_select_.h +++ b/lib/sys_select_.h @@ -24,7 +24,12 @@ <sys/types.h>. */ # include <sys/types.h> -# include @ABSOLUTE_SYS_SELECT_H@ + +# if @HAVE_INCLUDE_NEXT@ +# include_next <sys/select.h> +# else +# include @ABSOLUTE_SYS_SELECT_H@ +# endif #else
--- a/lib/sys_socket_.h +++ b/lib/sys_socket_.h @@ -30,7 +30,12 @@ <sys/types.h>. */ # include <sys/types.h> -# include @ABSOLUTE_SYS_SOCKET_H@ + +# if @HAVE_INCLUDE_NEXT@ +# include_next <sys/socket.h> +# else +# include @ABSOLUTE_SYS_SOCKET_H@ +# endif #else
--- a/lib/sys_stat_.h +++ b/lib/sys_stat_.h @@ -23,7 +23,12 @@ /* This file is supposed to be used on platforms where <sys/stat.h> is incomplete. It is intended to provide definitions and prototypes needed by an application. Start with what the system provides. */ -#include @ABSOLUTE_SYS_STAT_H@ + +#if @HAVE_INCLUDE_NEXT@ +# include_next <sys/stat.h> +#else +# include @ABSOLUTE_SYS_STAT_H@ +#endif #ifndef S_IFMT # define S_IFMT 0170000
--- a/lib/sysexits_.h +++ b/lib/sysexits_.h @@ -30,7 +30,11 @@ # undef EX_OK # endif -# include @ABSOLUTE_SYSEXITS_H@ +# if @HAVE_INCLUDE_NEXT@ +# include_next <sysexits.h> +# else +# include @ABSOLUTE_SYSEXITS_H@ +# endif /* HP-UX 11 <sysexits.h> ends at EX_NOPERM. */ # ifndef EX_CONFIG
--- a/lib/unistd_.h +++ b/lib/unistd_.h @@ -19,7 +19,11 @@ #define _GL_UNISTD_H #if @HAVE_UNISTD_H@ -# include @ABSOLUTE_UNISTD_H@ +# if @HAVE_INCLUDE_NEXT@ +# include_next <unistd.h> +# else +# include @ABSOLUTE_UNISTD_H@ +# endif #endif /* mingw doesn't define the SEEK_* macros in <unistd.h>. */
--- a/modules/fchdir +++ b/modules/fchdir @@ -28,6 +28,7 @@ rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''ABSOLUTE_DIRENT_H''@|$(ABSOLUTE_DIRENT_H)|g' \ + -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \ < $(srcdir)/dirent_.h; \ } > $@-t @@ -42,4 +43,3 @@ Maintainer: Bruno Haible -
--- a/modules/iconv_open +++ b/modules/iconv_open @@ -29,6 +29,7 @@ rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''ABSOLUTE_ICONV_H''@|$(ABSOLUTE_ICONV_H)|g' \ + -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ -e 's|@''REPLACE_ICONV_OPEN''@|$(REPLACE_ICONV_OPEN)|g' \ < $(srcdir)/iconv_.h; \ } > $@-t @@ -61,4 +62,3 @@ Maintainer: Bruno Haible -
--- a/modules/locale +++ b/modules/locale @@ -20,6 +20,7 @@ rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's|@''ABSOLUTE_LOCALE_H''@|$(ABSOLUTE_LOCALE_H)|g' \ + -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ < $(srcdir)/locale_.h; \ } > $@-t mv $@-t $@ @@ -33,4 +34,3 @@ Maintainer: Bruno Haible -
--- a/modules/netinet_in +++ b/modules/netinet_in @@ -23,6 +23,7 @@ rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''ABSOLUTE_NETINET_IN_H''@|$(ABSOLUTE_NETINET_IN_H)|g' \ + -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \ < $(srcdir)/netinet_in_.h; \ } > $@-t
--- a/modules/sys_select +++ b/modules/sys_select @@ -23,6 +23,7 @@ rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''ABSOLUTE_SYS_SELECT_H''@|$(ABSOLUTE_SYS_SELECT_H)|g' \ + -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ < $(srcdir)/sys_select_.h; \ } > $@-t
--- a/modules/sys_socket +++ b/modules/sys_socket @@ -22,6 +22,7 @@ @MKDIR_P@ sys { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''ABSOLUTE_SYS_SOCKET_H''@|$(ABSOLUTE_SYS_SOCKET_H)|g' \ + -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
--- a/modules/sys_stat +++ b/modules/sys_stat @@ -22,6 +22,7 @@ rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \ + -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ -e 's|@''HAVE_IO_H''@|$(HAVE_IO_H)|g' \ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ -e 's|@''HAVE_DECL_MKDIR''@|$(HAVE_DECL_MKDIR)|g' \
--- a/modules/sysexits +++ b/modules/sysexits @@ -20,6 +20,7 @@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_SYSEXITS_H''@|$(HAVE_SYSEXITS_H)|g' \ -e 's|@''ABSOLUTE_SYSEXITS_H''@|$(ABSOLUTE_SYSEXITS_H)|g' \ + -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ < $(srcdir)/sysexits_.h; \ } > $@-t mv -f $@-t $@
--- a/modules/unistd +++ b/modules/unistd @@ -22,6 +22,7 @@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ -e 's|@''ABSOLUTE_UNISTD_H''@|$(ABSOLUTE_UNISTD_H)|g' \ + -e 's/@''HAVE_INCLUDE_NEXT''@/$(HAVE_INCLUDE_NEXT)/g' \ -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \ -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \ -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \