- (dtucker) [configure.ac openbsd-compat/fake-rfc2553.c

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

diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h
index 0f8ab57add59b2f2bd4d1392a500ae4a3e5b3510..955986b50218d3f6bd81162e22f0d6bcf5101cb6 100644 (file)
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 /*
  * Copyright (C) 2000-2003 Damien Miller.  All rights reserved.
  * Copyright (C) 1999 WIDE Project.  All rights reserved.
@@ -35,8 +37,6 @@
  * that ai_family is AF_INET. Don't use it for another purpose.
  */
 
-/* $Id$ */
-
 #ifndef _FAKE_RFC2553_H
 #define _FAKE_RFC2553_H
 
@@ -88,12 +88,21 @@ struct sockaddr_in6 {
 
 #ifndef NI_NUMERICHOST
 # define NI_NUMERICHOST    (1)
+#endif
+#ifndef NI_NAMEREQD
 # define NI_NAMEREQD       (1<<1)
+#endif
+#ifndef NI_NUMERICSERV
 # define NI_NUMERICSERV    (1<<2)
 #endif
+
 #ifndef AI_PASSIVE
 # define AI_PASSIVE            (1)
+#endif
+#ifndef AI_CANONNAME
 # define AI_CANONNAME          (1<<1)
+#endif
+#ifndef AI_NUMERICHOST
 # define AI_NUMERICHOST                (1<<2)
 #endif
 
@@ -128,7 +137,7 @@ int getaddrinfo(const char *, const char *,
     const struct addrinfo *, struct addrinfo **);
 #endif /* !HAVE_GETADDRINFO */
 
-#ifndef HAVE_GAI_STRERROR
+#if !defined(HAVE_GAI_STRERROR) && !defined(HAVE_CONST_GAI_STRERROR_PROTO)
 char *gai_strerror(int);
 #endif /* !HAVE_GAI_STRERROR */