51 lines
2.2 KiB
Diff
51 lines
2.2 KiB
Diff
|
From 69b2494e526246aab5f32c7b233594a393988a51 Mon Sep 17 00:00:00 2001
|
||
|
|
From: yuiiio <atbjyk@protonmail.com>
|
||
|
|
Date: Fri, 26 Nov 2021 22:23:32 +0900
|
||
|
|
Subject: [PATCH] fix conflict ldap_connect
|
||
|
|
|
||
|
|
---
|
||
|
|
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 @@ WLDAP32_LDAP * CDECL cldap_openW( PWCHAR hostname, ULONG portnumber )
|
||
|
|
* 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)
|