Index: lib/getaddrinfo.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getaddrinfo.h,v
retrieving revision 1.18
diff -u -p -r1.18 getaddrinfo.h
--- lib/getaddrinfo.h	22 Jul 2006 10:13:57 -0000	1.18
+++ lib/getaddrinfo.h	19 Jan 2007 12:43:53 -0000
@@ -126,11 +126,16 @@ extern int getaddrinfo (const char *rest
 extern void freeaddrinfo (struct addrinfo *ai);
 #endif
 
-#if !HAVE_DECL_GAI_STRERROR
+
+#if !HAVE_DECL_GAI_STRERROR || !HAVE_GAI_STRERROR
 /* Convert error return from getaddrinfo() to a string.
    For more details, see the POSIX:2001 specification
    <http://www.opengroup.org/susv3xsh/gai_strerror.html>.  */
+#undef gai_strerror
+#define gai_strerror rpl_gai_strerror
+
 extern const char *gai_strerror (int ecode);
+
 #endif
 
 #if !HAVE_DECL_GETNAMEINFO