From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 24 Mar 2011 02:21:02 +0000 (+0000)
Subject: ITS#6859
X-Git-Tag: OPENLDAP_REL_ENG_2_4_25~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=778fe9cd7314a5a7b0c9dde0105eadf25a805fc9;p=openldap

ITS#6859
---

diff --git a/CHANGES b/CHANGES
index 75a33a2175..ed3ffc316c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,11 +7,13 @@ OpenLDAP 2.4.25 Engineering
 	Added slapd ordering for uidNumber and gidNumber (ITS#6852)
 	Fixed slapd segfault when adding values out of order (ITS#6858)
 	Fixed slapd sortval handling (ITS#6845)
+	Fixed slapd-bdb with slapadd/index quick option (ITS#6853)
 	Fixed slapd-ldap chain cn=config support (ITS#6837)
 	Fixed slapd-ldap chain with slapd.conf (ITS#6857)
 	Fixed slapd-meta deadlock (ITS#6846)
 	Fixed slapo-sssvlv with multiple requests (ITS#6850)
 	Build Environment
+		Fixed windows NT threads build (ITS#6859)
 		Fixed libldap/lberl/util if/else usage (ITS#6832)
 		Fixed Windows odbc32 detection (ITS#6125)
 		Fixed test020 exit codes (ITS#6404)
diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h
index dd7d4db908..fdcc4ad6c3 100644
--- a/include/ldap_int_thread.h
+++ b/include/ldap_int_thread.h
@@ -183,7 +183,7 @@ typedef DWORD	ldap_int_thread_key_t;
 #ifndef LDAP_INT_MUTEX_NULL
 #define LDAP_INT_MUTEX_NULL		((HANDLE)0)
 #define LDAP_INT_MUTEX_FIRSTCREATE(m) \
-		((void) ((m) || ldap_int_thread_mutex_init(&(m))))
+		((void) ((m) || ldap_pvt_thread_mutex_init(&(m))))
 #endif
 
 LDAP_END_DECL