merged OpenSSH 3.8.1p1 to trunk

[gssapi-openssh.git] / openssh / openbsd-compat / fake-rfc2553.h

diff --git a/openssh/openbsd-compat/fake-rfc2553.h b/openssh/openbsd-compat/fake-rfc2553.h
index 47b790f4e3e5e2828cae2ad76889b9fd5e0a7980..0928ef73a4264a914432d76951c076fd4848741d 100644 (file)
--- a/openssh/openbsd-compat/fake-rfc2553.h
+++ b/openssh/openbsd-compat/fake-rfc2553.h
@@ -133,6 +133,9 @@ struct addrinfo {
 #endif /* !HAVE_STRUCT_ADDRINFO */
 
 #ifndef HAVE_GETADDRINFO
+#ifdef getaddrinfo
+# undef getaddrinfo
+#endif
 #define getaddrinfo(a,b,c,d)   (ssh_getaddrinfo(a,b,c,d))
 int getaddrinfo(const char *, const char *, 
     const struct addrinfo *, struct addrinfo **);