From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 26 Jan 2004 20:55:31 +0000 (+0000)
Subject: import HEAD's socket.h to address, in part, ITS#2643
X-Git-Tag: OPENLDAP_REL_ENG_2_1_27~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad1ba9fd09548085606c55179eb200ce0f1d3ac6;p=thirdparty%2Fopenldap.git

import HEAD's socket.h to address, in part, ITS#2643
---

diff --git a/include/ac/socket.h b/include/ac/socket.h
index c0590c2e3d..e0b7ec945d 100644
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -1,14 +1,17 @@
 /* Generic socket.h */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted only as authorized by the OpenLDAP
- * Public License.  A copy of this license is available at
- * http://www.OpenLDAP.org/license.html or in file LICENSE in the
- * top-level directory of the distribution.
+ * Public License.
+ *
+ * A copy of this license is available in file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #ifndef _AC_SOCKET_H_
@@ -192,7 +195,7 @@ LDAP_F (int) ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
 #	define INET6_ADDRSTRLEN 46
 #endif
 
-#ifdef HAVE_GETADDRINFO
+#if defined( HAVE_GETADDRINFO ) || defined( HAVE_GETNAMEINFO )
 #	ifdef HAVE_GAI_STRERROR
 #		define AC_GAI_STRERROR(x)	(gai_strerror((x)))
 #	else