From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 25 Jan 2022 15:29:49 +0000 (+0200)
Subject: ITS#9790 Fix build with old GCC
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70c9dbf93da6d21b5055954a603e08ed82b4322e;p=thirdparty%2Fopenldap.git

ITS#9790 Fix build with old GCC

Versions 4.1 and 4.3 show the following error:

In file included from ../../include/lutil.h:21,
                 from passwd.c:60:
../../include/ac/socket.h:247: error: redefinition of typedef 'Sockaddr'
../../include/ldap_pvt.h:188: error: previous declaration of 'Sockaddr' was here
---

diff --git a/include/ldap_pvt.h b/include/ldap_pvt.h
index 27a5afd235..ba6ec152c6 100644
--- a/include/ldap_pvt.h
+++ b/include/ldap_pvt.h
@@ -185,11 +185,11 @@ ldap_pvt_get_hname LDAP_P((
 #define LDAP_IPADDRLEN	sizeof("IP=255.255.255.255:65336")
 #endif
 
-typedef union Sockaddr Sockaddr;
+union Sockaddr;
 
 LDAP_F (void)
 ldap_pvt_sockaddrstr LDAP_P((
-	Sockaddr *sa,
+	union Sockaddr *sa,
 	struct berval * ));