Mercurial > gnulib

changeset 10034:755ab2f17a87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jim Meyering <meyering@redhat.com>
date Sat, 03 May 2008 11:46:58 +0200
parents 24328ed2c4f6
children 328c376f78e9
files lib/getaddrinfo.h tests/test-getaddrinfo.c
diffstat 2 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lib/getaddrinfo.h	Sat May 03 12:51:08 2008 +0200
+++ b/lib/getaddrinfo.h	Sat May 03 11:46:58 2008 +0200
@@ -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 @@
 # 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.  */
--- a/tests/test-getaddrinfo.c	Sat May 03 12:51:08 2008 +0200
+++ b/tests/test-getaddrinfo.c	Sat May 03 11:46:58 2008 +0200
@@ -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];