Module: wine Branch: oldstable Commit: 7f1d6a8ee2c72409f4f840df23401c9702adee5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f1d6a8ee2c72409f4f840df2...
Author: Hans Leidekker hans@codeweavers.com Date: Wed Oct 27 19:23:14 2021 +0200
wldap32: Rename ldap_connect() to avoid a name conflict.
Fixes the build against OpenLDAP 2.5.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51129 Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
dlls/wldap32/init.c | 2 +- dlls/wldap32/winldap_private.h | 2 +- dlls/wldap32/wldap32.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index afaef3b52f2..d3409d1465b 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -322,7 +322,7 @@ exit: * The timeout parameter may be NULL in which case a default timeout * value will be used. */ -ULONG CDECL ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout ) +ULONG CDECL WLDAP32_ldap_connect( WLDAP32_LDAP *ld, struct l_timeval *timeout ) { TRACE( "(%p, %p)\n", ld, timeout );
diff --git a/dlls/wldap32/winldap_private.h b/dlls/wldap32/winldap_private.h index 69035050961..a6cddabf559 100644 --- a/dlls/wldap32/winldap_private.h +++ b/dlls/wldap32/winldap_private.h @@ -320,7 +320,7 @@ ULONG CDECL ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct WLDAP32_b ULONG CDECL ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct WLDAP32_berval*,PLDAPControlW*,PLDAPControlW*); ULONG CDECL ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); ULONG CDECL ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); -ULONG CDECL ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); +ULONG CDECL WLDAP32_ldap_connect(WLDAP32_LDAP*,LDAP_TIMEVAL*); WLDAP32_LDAP * CDECL ldap_conn_from_msg(WLDAP32_LDAP*,WLDAP32_LDAPMessage*); ULONG CDECL ldap_control_freeA(LDAPControlA*); ULONG CDECL ldap_control_freeW(LDAPControlW*); diff --git a/dlls/wldap32/wldap32.spec b/dlls/wldap32/wldap32.spec index 8a8e29fc198..33e630dea87 100644 --- a/dlls/wldap32/wldap32.spec +++ b/dlls/wldap32/wldap32.spec @@ -75,7 +75,7 @@ 85 cdecl ldap_compare_ext_sW(ptr wstr wstr wstr ptr ptr ptr) 86 cdecl ldap_compare_sA(ptr str str str) 87 cdecl ldap_compare_sW(ptr wstr wstr wstr) - 88 cdecl ldap_connect(ptr ptr) + 88 cdecl ldap_connect(ptr ptr) WLDAP32_ldap_connect 89 cdecl ldap_control_free(ptr) ldap_control_freeA 90 cdecl ldap_control_freeA(ptr) 91 cdecl ldap_control_freeW(ptr)