wldap32: struvt *berval versus PBERVAL
Hallo, a recent CVS checkout failed in wldap32. Shouldn't "struvt *berval" be substituded agains PBERVAL? -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- Index: wine/dlls/wldap32/winldap_private.h =================================================================== RCS file: /home/wine/wine/dlls/wldap32/winldap_private.h,v retrieving revision 1.12 diff -u -r1.12 winldap_private.h --- wine/dlls/wldap32/winldap_private.h 1 Aug 2005 14:51:18 -0000 1.12 +++ wine/dlls/wldap32/winldap_private.h 1 Aug 2005 15:56:23 -0000 @@ -122,10 +122,10 @@ ULONG ldap_bind_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,ULONG); ULONG ldap_compareA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); ULONG ldap_compareW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); -ULONG ldap_compare_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*,ULONG*); -ULONG ldap_compare_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*,ULONG*); -ULONG ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,struct berval*,PLDAPControlA*,PLDAPControlA*); -ULONG ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,struct berval*,PLDAPControlW*,PLDAPControlW*); +ULONG ldap_compare_extA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,PBERVAL,PLDAPControlA*,PLDAPControlA*,ULONG*); +ULONG ldap_compare_extW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,PBERVAL,PLDAPControlW*,PLDAPControlW*,ULONG*); +ULONG ldap_compare_ext_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR,PBERVAL,PLDAPControlA*,PLDAPControlA*); +ULONG ldap_compare_ext_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR,PBERVAL,PLDAPControlW*,PLDAPControlW*); ULONG ldap_compare_sA(WLDAP32_LDAP*,PCHAR,PCHAR,PCHAR); ULONG ldap_compare_sW(WLDAP32_LDAP*,PWCHAR,PWCHAR,PWCHAR); PCHAR ldap_err2stringA(ULONG); Index: wine/dlls/wldap32/compare.c =================================================================== RCS file: /home/wine/wine/dlls/wldap32/compare.c,v retrieving revision 1.1 diff -u -r1.1 compare.c --- wine/dlls/wldap32/compare.c 1 Aug 2005 14:51:18 -0000 1.1 +++ wine/dlls/wldap32/compare.c 1 Aug 2005 15:56:23 -0000 @@ -115,7 +115,7 @@ } ULONG ldap_compare_extA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value, - struct berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, + PBERVAL data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls, ULONG *message ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -166,7 +166,7 @@ } ULONG ldap_compare_extW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value, - struct berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, + PBERVAL data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls, ULONG *message ) { ULONG ret = LDAP_NOT_SUPPORTED; @@ -224,7 +224,7 @@ } ULONG ldap_compare_ext_sA( WLDAP32_LDAP *ld, PCHAR dn, PCHAR attr, PCHAR value, - struct berval *data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) + PBERVAL data, PLDAPControlA *serverctrls, PLDAPControlA *clientctrls ) { ULONG ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP @@ -274,7 +274,7 @@ } ULONG ldap_compare_ext_sW( WLDAP32_LDAP *ld, PWCHAR dn, PWCHAR attr, PWCHAR value, - struct berval *data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) + PBERVAL data, PLDAPControlW *serverctrls, PLDAPControlW *clientctrls ) { ULONG ret = LDAP_NOT_SUPPORTED; #ifdef HAVE_LDAP
On Monday 1 August 2005 19:39, Hans Leidekker wrote:
a recent CVS checkout failed in wldap32. Shouldn't "struvt *berval" be substituded agains PBERVAL?
Yes, that's an acceptable solution.
Spoke too soon. It creates other compile problems (when you do have openldap headers). Better would be to change struct *berval into struct WLDAP32_berval*. -Hans
* On Mon, 1 Aug 2005, Hans Leidekker wrote:
* On Monday 1 August 2005 19:39, Hans Leidekker wrote:
a recent CVS checkout failed in wldap32. Shouldn't "struvt *berval" be substituded agains PBERVAL?
Yes, that's an acceptable solution.
Spoke too soon. It creates other compile problems (when you do have openldap headers). Better would be to change struct *berval into struct WLDAP32_berval*.
Are you both talking about this: | make[2]: Entering directory `/mnt/antras/usr/src/wine-cvs/wine/dlls/wldap32' | gcc -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_REENTRANT -fPIC -Wall -pipe -mpreferred-stack-boundary=2 -fno-strict-aliasing -gstabs+ -Wpointer-arith -g -O2 -o compare.o compare.c | In file included from compare.c:38: | winldap_private.h:125: warning: `struct berval' declared inside parameter list | winldap_private.h:125: warning: its scope is only this definition or declaration, which is probably not what you want | winldap_private.h:126: warning: `struct berval' declared inside parameter list | winldap_private.h:127: warning: `struct berval' declared inside parameter list | winldap_private.h:128: warning: `struct berval' declared inside parameter list | compare.c:119: warning: `struct berval' declared inside parameter list | compare.c:120: conflicting types for `ldap_compare_extA' | winldap_private.h:125: previous declaration of `ldap_compare_extA' | compare.c:170: warning: `struct berval' declared inside parameter list | compare.c:171: conflicting types for `ldap_compare_extW' | winldap_private.h:126: previous declaration of `ldap_compare_extW' | compare.c:227: warning: `struct berval' declared inside parameter list | compare.c:228: conflicting types for `ldap_compare_ext_sA' | winldap_private.h:127: previous declaration of `ldap_compare_ext_sA' | compare.c:277: warning: `struct berval' declared inside parameter list | compare.c:278: conflicting types for `ldap_compare_ext_sW' | winldap_private.h:128: previous declaration of `ldap_compare_ext_sW' | make[2]: *** [compare.o] Error 1 | make[2]: Leaving directory `/mnt/antras/usr/src/wine-cvs/wine/dlls/wldap32' ? What should I do to compile my tree?
participants (3)
-
Hans Leidekker -
Saulius Krasuckas -
Uwe Bonnes