summaryrefslogtreecommitdiff
path: root/lib/netdb.in.h
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2010-02-17 17:50:43 +0100
committerLudovic Courtès <ludo@gnu.org>2010-02-17 17:50:43 +0100
commitdde9c5a431c67a16febf000d011172c65883f49b (patch)
treedca6d796e10e523f609f74cdc6ea1981751b64b3 /lib/netdb.in.h
parent44d70904a6ae93e0a844dedf65b2f84dc93a5048 (diff)
downloadguile-dde9c5a431c67a16febf000d011172c65883f49b.tar.gz
Update to Gnulib v0.0-3448-g6078aa4 for its <netdb.h> fix.
Reverts commit 691b9ec196203fa5d6da3530d5355b2f73e707d1 ("getaddrinfo: Define macros lacking in NetBSD 5.0."). * libguile/net_db.c (AI_ALL, AI_V4MAPPED, AI_ADDRCONFIG): Remove placeholder definitions, how provided by Gnulib's <netdb.h>.
Diffstat (limited to 'lib/netdb.in.h')
-rw-r--r--lib/netdb.in.h28
1 files changed, 17 insertions, 11 deletions
diff --git a/lib/netdb.in.h b/lib/netdb.in.h
index 981a432b1..8fa6164fe 100644
--- a/lib/netdb.in.h
+++ b/lib/netdb.in.h
@@ -74,18 +74,24 @@ struct addrinfo
# endif
# if 0
-/* The commented out definitions below are not yet implemented in the
- GNULIB getaddrinfo() replacement, so are not yet needed and may, in fact,
- cause conflicts on systems with a getaddrinfo() function which does not
- define them.
-
- If they are restored, be sure to protect the definitions with #ifndef. */
# define AI_NUMERICHOST 0x0004 /* Don't use name resolution. */
-# define AI_V4MAPPED 0x0008 /* IPv4 mapped addresses are acceptable. */
-# define AI_ALL 0x0010 /* Return IPv4 mapped and IPv6 addresses. */
-# define AI_ADDRCONFIG 0x0020 /* Use configuration of this host to choose
- returned address type.. */
-# endif /* 0 */
+# endif
+
+/* These symbolic constants are required to be present by POSIX, but
+ our getaddrinfo replacement doesn't use them (yet). Setting them
+ to 0 on systems that doesn't have them avoids causing problems for
+ system getaddrinfo implementations that would be confused by
+ unknown values. */
+# ifndef AI_V4MAPPED
+# define AI_V4MAPPED 0 /* 0x0008: IPv4 mapped addresses are acceptable. */
+# endif
+# ifndef AI_ALL
+# define AI_ALL 0 /* 0x0010: Return IPv4 mapped and IPv6 addresses. */
+# endif
+# ifndef AI_ADDRCONFIG
+# define AI_ADDRCONFIG 0 /* 0x0020: Use configuration of this host to choose
+ returned address type. */
+# endif
/* Error values for `getaddrinfo' function. */
# ifndef EAI_BADFLAGS