From 3973cd8f26ce1c02979e8751b45f4efb7e8726ad Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 10 Nov 2008 08:04:22 +0000
Subject: [PATCH] Fixup getaddrinfo compat.

git-svn-id: file:///svn/unbound/trunk@1341 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 compat/fake-rfc2553.h | 8 ++++----
 config.h.in           | 4 ----
 configure.ac          | 4 ----
 doc/Changelog         | 3 +++
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/compat/fake-rfc2553.h b/compat/fake-rfc2553.h
index 3d30cf767..466c0e663 100644
--- a/compat/fake-rfc2553.h
+++ b/compat/fake-rfc2553.h
@@ -149,23 +149,23 @@ struct addrinfo {
 #ifdef getaddrinfo
 # undef getaddrinfo
 #endif
-#define getaddrinfo(a,b,c,d)	(ssh_getaddrinfo(a,b,c,d))
+#define getaddrinfo(a,b,c,d)	(getaddrinfo_unbound(a,b,c,d))
 int getaddrinfo(const char *, const char *, 
     const struct addrinfo *, struct addrinfo **);
 #endif /* !HAVE_GETADDRINFO */
 
 #if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO)
-#define gai_strerror(a)		(ssh_gai_strerror(a))
+#define gai_strerror(a)		(gai_strerror_unbound(a))
 char *gai_strerror(int);
 #endif /* !HAVE_GAI_STRERROR */
 
 #ifndef HAVE_FREEADDRINFO
-#define freeaddrinfo(a)		(ssh_freeaddrinfo(a))
+#define freeaddrinfo(a)		(freeaddrinfo_unbound(a))
 void freeaddrinfo(struct addrinfo *);
 #endif /* !HAVE_FREEADDRINFO */
 
 #ifndef HAVE_GETNAMEINFO
-#define getnameinfo(a,b,c,d,e,f,g) (ssh_getnameinfo(a,b,c,d,e,f,g))
+#define getnameinfo(a,b,c,d,e,f,g) (getnameinfo_unbound(a,b,c,d,e,f,g))
 int getnameinfo(const struct sockaddr *, size_t, char *, size_t, 
     char *, size_t, int);
 #endif /* !HAVE_GETNAMEINFO */
diff --git a/config.h.in b/config.h.in
index 973856ac0..24ce31bd8 100644
--- a/config.h.in
+++ b/config.h.in
@@ -558,10 +558,6 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
 struct tm *gmtime_r(const time_t *timep, struct tm *result);
 #endif
 #ifndef HAVE_GETADDRINFO
-#define getaddrinfo getaddrinfo_unbound
-#define gai_strerror gai_strerror_unbound
-#define freeaddrinfo freeaddrinfo_unbound
-#define getnameinfo getnameinfo_unbound
 struct sockaddr_storage;
 #include "compat/fake-rfc2553.h"
 #endif
diff --git a/configure.ac b/configure.ac
index b76245c50..8679c6618 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1164,10 +1164,6 @@ size_t strlcpy(char *dst, const char *src, size_t siz);
 struct tm *gmtime_r(const time_t *timep, struct tm *result);
 #endif
 #ifndef HAVE_GETADDRINFO
-#define getaddrinfo getaddrinfo_unbound
-#define gai_strerror gai_strerror_unbound
-#define freeaddrinfo freeaddrinfo_unbound
-#define getnameinfo getnameinfo_unbound
 struct sockaddr_storage;
 #include "compat/fake-rfc2553.h"
 #endif
diff --git a/doc/Changelog b/doc/Changelog
index c9fb279b3..37c2157db 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+10 November 2008: Wouter
+	- fixup the getaddrinfo compat code rename.
+
 8 November 2008: Wouter
 	- added configure check for eee build warning.