From: dtucker <dtucker>
Date: Mon, 25 Feb 2008 09:21:20 +0000 (+0000)
Subject:  - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack
X-Git-Tag: V_4_9_P1~59
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/2db5d1e99d07df3ac8023af52aaa09f0513a9e61

 - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack
   since it now conflicts with the helper function in misc.c.  From
   vinschen AT redhat.com.
---

diff --git a/ChangeLog b/ChangeLog
index fcce63bd..e5e6587a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20080225
+ - (dtucker) [openbsd-compat/fake-rfc2553.h] rename ssh_gai_strerror hack
+   since it now conflicts with the helper function in misc.c.  From
+   vinschen AT redhat.com.
+
 20080224
  - (tim) [contrib/cygwin/ssh-host-config]
    Grammar changes on SYSCONFDIR LOCALSTATEDIR messages.
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h
index 8431a42f..60212b40 100644
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -152,7 +152,7 @@ int getaddrinfo(const char *, const char *,
 #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)		(_ssh_compat_gai_strerror(a))
 char *gai_strerror(int);
 #endif /* !HAVE_GAI_STRERROR */