From: Bruno Haible <bruno@clisp.org>
Date: Fri, 29 Apr 2011 12:09:15 +0000 (+0200)
Subject: netdb: fix gai_strerror replacements
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3864a29763baff1d01895a57f73729fd53cc5fbf;p=pspp

netdb: fix gai_strerror replacements

* lib/netdb.in.h: Add _GL_FUNCDECL_RPL definitions.
* modules/netdb: Substitute it.
---

diff --git a/ChangeLog b/ChangeLog
index dc01efd6c1..874a093e3a 100644
--- 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
diff --git a/lib/netdb.in.h b/lib/netdb.in.h
index 64cd9ac53b..c1cf671d59 100644
--- 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.  */
diff --git a/modules/netdb b/modules/netdb
index 8d210c949e..59f26891d4 100644
--- a/modules/netdb
+++ b/modules/netdb
@@ -6,6 +6,7 @@ lib/netdb.in.h
 m4/netdb_h.m4
 
 Depends-on:
+c++defs
 include_next
 arg-nonnull
 warn-on-use
@@ -19,7 +20,7 @@ BUILT_SOURCES += netdb.h
 
 # 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 @@ netdb.h: netdb.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) $(WARN_ON_USE
 	      -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; \