From d929dc60b94b7fd2b59940f7ef58ebe9e3362827 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 11 Jan 2011 21:44:14 +0000 Subject: [PATCH] More for ITS#6625 --- libraries/libldap/init.c | 2 ++ libraries/libldap/ldap-int.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index 3355b4c8dc..a2808b3bc7 100644 --- a/libraries/libldap/init.c +++ b/libraries/libldap/init.c @@ -510,7 +510,9 @@ ldap_int_destroy_global_options(void) */ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl ) { +#ifdef LDAP_R_COMPILE LDAP_PVT_MUTEX_FIRSTCREATE(gopts->ldo_mutex); +#endif LDAP_MUTEX_LOCK( &gopts->ldo_mutex ); if (gopts->ldo_valid == LDAP_INITIALIZED) { /* someone else got here first */ diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h index 9bbd056dc4..da485e8878 100644 --- a/libraries/libldap/ldap-int.h +++ b/libraries/libldap/ldap-int.h @@ -189,7 +189,6 @@ struct ldapoptions { #define LDAP_LDO_MUTEX_NULLARG , LDAP_PVT_MUTEX_NULL #else #define LDAP_LDO_MUTEX_NULLARG -#define LDAP_PVT_MUTEX_FIRSTCREATE(m) ((void) 0) #endif #ifdef LDAP_CONNECTIONLESS -- 2.39.5