Mercurial > hg > octave-lojdl > gnulib-hg
changeset 14650:07d9c9edd3d3
netdb: fix gai_strerror replacements
* lib/netdb.in.h: Add _GL_FUNCDECL_RPL definitions.
* modules/netdb: Substitute it.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Fri, 29 Apr 2011 14:09:15 +0200 |
| parents | f1968342f62e |
| children | dab11becac47 |
| files | ChangeLog lib/netdb.in.h modules/netdb |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-04-29 Bruno Haible <bruno@clisp.org> + + netdb: fix gai_strerror replacements + * lib/netdb.in.h: Add _GL_FUNCDECL_RPL definitions. + * modules/netdb: Substitute it. + 2011-04-29 Jim Meyering <meyering@redhat.com> test-getcwd.c: avoid new set-but-not-used warning
--- a/lib/netdb.in.h +++ b/lib/netdb.in.h @@ -41,6 +41,8 @@ 'struct hostent' on MinGW. */ #include <sys/socket.h> +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + /* The definition of _GL_ARG_NONNULL is copied here. */ /* The definition of _GL_WARN_ON_USE is copied here. */
--- a/modules/netdb +++ b/modules/netdb @@ -6,6 +6,7 @@ m4/netdb_h.m4 Depends-on: +c++defs include_next arg-nonnull warn-on-use @@ -19,7 +20,7 @@ # We need the following in order to create <netdb.h> when the system # doesn't have one that works with the given compiler. -netdb.h: netdb.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) $(WARN_ON_USE_H) +netdb.h: netdb.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ @@ -34,6 +35,7 @@ -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \ -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \ -e 's|@''REPLACE_GAI_STRERROR''@|$(REPLACE_GAI_STRERROR)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ < $(srcdir)/netdb.in.h; \