Re: [patch #6758] Add support for Atari FreeMiNT OS

[Simon Josefsson]

Alan Hourihane <address@hidden> writes:

> On Sun, 2009-03-01 at 13:38 +0100, Bruno Haible wrote:
>> Alan Hourihane wrote:
>> > In netdb.in.h we have....
>> > 
>> > #  ifndef EAI_INPROGRESS
>> > 
>> > but in gai_strerror.c we have...
>> > 
>> > #ifdef __USE_GNU
>> > 
>> > Can we be consistent here and use 
>> > 
>> > #ifdef EAI_INPROGRESS in gai_strerror.c
>> 
>> This is Simon's domain. But yes, this would be consistent with the change
>> done on 2008-10-20.
>
> I'd certainly prefer this option too :-)

I've pushed the fix, thanks.

/Simon

>From 3e4151d4339192f004275caa3b3de921a8575fb9 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <address@hidden>
Date: Sun, 1 Mar 2009 17:25:53 +0100
Subject: [PATCH] getaddrinfo: Use EAI_INPROGRESS instead of __USE_GNU, for 
consistency with netdb.in.h.

---
 ChangeLog          |    6 ++++++
 lib/gai_strerror.c |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 042250b..080e4b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-01  Simon Josefsson  <address@hidden>
+
+       * lib/gai_strerror.c (values): Use EAI_INPROGRESS instead of
+       __USE_GNU, for consistency with netdb.in.h.
+       Reported by Alan Hourihane <address@hidden>.
+
 2009-03-01  Bruno Haible  <address@hidden>
 
        More support for FreeMiNT.
diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c
index 60042e8..e11c979 100644
--- a/lib/gai_strerror.c
+++ b/lib/gai_strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006, 2008 Free Software 
Foundation, Inc.
+/* Copyright (C) 1997, 2001, 2002, 2004, 2005, 2006, 2008, 2009 Free Software 
Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Philip Blundell <address@hidden>, 1997.
 
@@ -50,7 +50,7 @@ values[] =
     { EAI_SOCKTYPE, N_("ai_socktype not supported") },
     { EAI_SYSTEM, N_("System error") },
     { EAI_OVERFLOW, N_("Argument buffer too small") },
-#ifdef __USE_GNU
+#ifdef EAI_INPROGRESS
     { EAI_INPROGRESS, N_("Processing request in progress") },
     { EAI_CANCELED, N_("Request canceled") },
     { EAI_NOTCANCELED, N_("Request not canceled") },
-- 
1.5.6.5