getaddrinfo.h: handle undefined EAI_NODATA

* lib/getaddrinfo.h [!defined EAI_NODATA && defined EAI_NONAME]
(EAI_NODATA): Define.
* tests/test-getaddrinfo.c (EAI_NODATA): Don't define here.
This also reverts c9a6a9bb007294bb8878d685f3e9336b3a5be1ed.

diff --git a/lib/getaddrinfo.h b/lib/getaddrinfo.h
index b4ef242cf1a1f5f1914bf5a5b00ceb45bff4c0b1..0e9aec176356436991a73c6e8fca1edf68f04716 100644 (file)
--- a/lib/getaddrinfo.h
+++ b/lib/getaddrinfo.h
@@ -1,5 +1,5 @@
 /* Get address information.
-   Copyright (C) 1996-2002, 2003, 2004, 2005, 2006
+   Copyright (C) 1996-2002, 2003, 2004, 2005, 2006, 2008
                  Free Software Foundation, Inc.
    Contributed by Simon Josefsson <simon@josefsson.org>.
 
@@ -84,6 +84,14 @@ struct addrinfo
 # define EAI_SERVICE     -8    /* SERVICE not supported for `ai_socktype'.  */
 # define EAI_MEMORY      -10   /* Memory allocation failure.  */
 #endif
+
+/* Since EAI_NODATA is deprecated by RFC3493, some systems (at least
+   FreeBSD, which does define EAI_BADFLAGS) have removed the definition
+   in favor of EAI_NONAME.  */
+#if !defined EAI_NODATA && defined EAI_NONAME
+# define EAI_NODATA EAI_NONAME
+#endif
+
 #ifndef EAI_OVERFLOW
 /* Not defined on mingw32. */
 # define EAI_OVERFLOW    -12   /* Argument buffer overflow.  */

diff --git a/tests/test-getaddrinfo.c b/tests/test-getaddrinfo.c
index 801bae827a89b017906b3f9aa6b0cb324c80038b..8d487cb5bf48c90492710bee2c7ef01e4a2d9511 100644 (file)
--- a/tests/test-getaddrinfo.c
+++ b/tests/test-getaddrinfo.c
@@ -32,10 +32,6 @@
 # define EAI_SERVICE 0
 #endif
 
-#ifndef EAI_NODATA
-# define EAI_NODATA 0
-#endif
-
 int simple (char *host, char *service)
 {
   char buf[BUFSIZ];