More for ITS#6625

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 3355b4c8dcb3ee05428ff25697ce4e8a35c7dfa7..a2808b3bc73cef1c475ed5772bbfc7796bb292a5 100644 (file)
--- 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 9bbd056dc4e9dec0e1e123a876d9cd4f08dcd5f2..da485e887852cc34e8aa0c8fd46a3a1709159dc3 100644 (file)
--- 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