- (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 57705fdb8d7c9ef379655c2ec5e0ce01ed37eda4..955986b50218d3f6bd81162e22f0d6bcf5101cb6 100644 (file)
--- a/openbsd-compat/fake-rfc2553.h
+++ b/openbsd-compat/fake-rfc2553.h
@@ -1,3 +1,34 @@
+/* $Id$ */
+
+/*
+ * Copyright (C) 2000-2003 Damien Miller.  All rights reserved.
+ * Copyright (C) 1999 WIDE Project.  All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the project nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
 /*
  * Pseudo-implementation of RFC2553 name / address resolution functions
  *
@@ -6,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
 
@@ -59,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
 
@@ -99,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 */