Re: getaddrinfo, netdb

[Simon Josefsson]

Bruno Haible <address@hidden> writes:

> Simon Josefsson wrote:
>> -#ifdef __USE_GNU
>> -# ifndef EAI_INPROGRESS
>> -#  define EAI_INPROGRESS    -100    /* Processing request in progress.  */
>> -#  define EAI_CANCELED              -101    /* Request canceled.  */
>> -#  define EAI_NOTCANCELED   -102    /* Request not canceled.  */
>> -#  define EAI_ALLDONE               -103    /* All requests done.  */
>> -#  define EAI_INTR          -104    /* Interrupted by a signal.  */
>> -#  define EAI_IDN_ENCODE    -105    /* IDN encoding failed.  */
>> -# endif
>> -#endif
>
> The macro __USE_GNU is defined on glibc systems when compiling with
> -D_GNU_SOURCE. In the context of gnulib, this makes no sense. Did you mean
> to enable these definitions, or not?

They were cut'n'paste'd from the glibc header.  I have disabled them,
similar to how AI_NUMERICHOST etc are disabled earlier in the same
header.  What do you think?  I pushed the patch below.

/Simon

>From e55f1a85b97d183fd5c49ead1fc21711edb529cf Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Mon, 20 Oct 2008 12:08:43 +0200
Subject: [PATCH] lib/netdb.in.h: Don't define GNU specific constants.
 Reported by Bruno Haible <address@hidden>.

---
 ChangeLog      |    6 ++++++
 lib/netdb.in.h |    6 +++++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 808510e..2414e6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-10-20  Simon Josefsson  <address@hidden>
 
+       * lib/netdb.in.h: Don't define GNU specific constants until they
+       are supported or needed.  Reported by Bruno Haible
+       <address@hidden>.
+
+2008-10-20  Simon Josefsson  <address@hidden>
+
        * lib/getaddrinfo.h: Remove file.
        * modules/getaddrinfo: Reflect move from getaddrinfo.h to netdb.h.
        * m4/getaddrinfo.m4: Call gl_HEADER_NETDB.  Don't check for netdb.h.
diff --git a/lib/netdb.in.h b/lib/netdb.in.h
index e8121aa..0399646 100644
--- a/lib/netdb.in.h
+++ b/lib/netdb.in.h
@@ -123,7 +123,11 @@ struct addrinfo
 #  define EAI_SYSTEM     -11   /* System error returned in `errno'.  */
 # endif
 
-# ifdef __USE_GNU
+# if 0
+/* The commented out definitions below are not yet implemented in the
+   GNULIB getaddrinfo() replacement, so are not yet needed.
+
+   If they are restored, be sure to protect the definitions with #ifndef.  */
 #  ifndef EAI_INPROGRESS
 #   define EAI_INPROGRESS      -100    /* Processing request in progress.  */
 #   define EAI_CANCELED                -101    /* Request canceled.  */
-- 
1.5.6.5