From: Kurt Zeilenga <kurt@openldap.org>
Date: Mon, 13 Mar 2000 19:30:14 +0000 (+0000)
Subject: Fix NT builds and remove lint
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~3153
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=db662b516fe82272beccfe02bd1b2521a2b09108;p=openldap

Fix NT builds and remove lint
---

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index 27b2310ddc..bf2228a6d8 100644
--- a/libraries/libldap/request.c
+++ b/libraries/libldap/request.c
@@ -762,7 +762,6 @@ re_encode_request( LDAP *ld, BerElement *origber, ber_int_t msgid, char **dnp )
  * XXX this routine knows way too much about how the lber library works!
  */
 	ber_int_t	along;
-	ber_len_t	len;
 	ber_tag_t	tag;
 	ber_int_t	ver;
 	int		rc;
diff --git a/libraries/libldap_r/libldap_r.dsp b/libraries/libldap_r/libldap_r.dsp
index bc6f09c27e..f4790c35e5 100644
--- a/libraries/libldap_r/libldap_r.dsp
+++ b/libraries/libldap_r/libldap_r.dsp
@@ -43,7 +43,7 @@ CPP=cl.exe
 # PROP Intermediate_Dir "..\..\Release\libldap_r"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "LDAP_R_COMPILE" /D "WIN32" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\..\include" /D "LDAP_R_COMPILE" /D "WIN32" /D "_WINDOWS" /D _WIN32_WINNT=0x0400 /YX /FD /c
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "..\..\Debug\libldap_r"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "_DEBUG" /D "LDAP_R_COMPILE" /D "WIN32" /D "_WINDOWS" /FR /YX /FD /c
+# ADD CPP /nologo /MTd /W3 /GX /Z7 /Od /I "..\..\include" /D "_DEBUG" /D "LDAP_R_COMPILE" /D "WIN32" /D "_WINDOWS" /D _WIN32_WINNT=0x0400 /FR /YX /FD /c
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
diff --git a/libraries/libldap_r/thr_nt.c b/libraries/libldap_r/thr_nt.c
index d3d41ff3c6..4213436271 100644
--- a/libraries/libldap_r/thr_nt.c
+++ b/libraries/libldap_r/thr_nt.c
@@ -102,9 +102,9 @@ ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond,
 }
 
 int
-ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cv )
+ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cond )
 {
-	SetEvent( *cv );
+	SetEvent( *cond );
 	return( 0 );
 }
 
diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 1fbd5d3e38..2899e38e77 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -35,15 +35,13 @@ do_compare(
 	struct berval value;
 	Backend	*be;
 	int rc = LDAP_SUCCESS;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	char *text = NULL;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	AttributeAssertion ava;
-
 	ava.aa_desc = NULL;
 #else
 	Ava	ava;
 #endif
-	char *text;
 
 	desc.bv_val = NULL;
 	value.bv_val = NULL;