diff --git a/libraries/libldap/ldap_thr_debug.h b/libraries/libldap/ldap_thr_debug.h index cef2411c05..1374b71ac5 100644 --- a/libraries/libldap/ldap_thr_debug.h +++ b/libraries/libldap/ldap_thr_debug.h @@ -119,8 +119,6 @@ #define ldap_pvt_thread_pool_pause ldap_int_thread_pool_pause #define ldap_pvt_thread_pool_resume ldap_int_thread_pool_resume #define ldap_pvt_thread_pool_destroy ldap_int_thread_pool_destroy -#define ldap_pvt_thread_pool_close ldap_int_thread_pool_close -#define ldap_pvt_thread_pool_free ldap_int_thread_pool_free #define ldap_pvt_thread_pool_getkey ldap_int_thread_pool_getkey #define ldap_pvt_thread_pool_setkey ldap_int_thread_pool_setkey #define ldap_pvt_thread_pool_purgekey ldap_int_thread_pool_purgekey @@ -138,11 +136,9 @@ */ #undef ldap_pvt_thread_pool_destroy #define ldap_pvt_thread_pool_destroy(p,r) ldap_int_thread_pool_destroy(p,r) -#if 0 #define ldap_pvt_thread_pool_close(p,r) ldap_int_thread_pool_close(p,r) #define ldap_pvt_thread_pool_free(p) ldap_int_thread_pool_free(p) #endif -#endif #ifdef LDAP_THREAD_DEBUG_IMPLEMENTATION /* thr_debug.c */ #undef ldap_pvt_thread_mutex_t diff --git a/libraries/libldap/thr_debug.c b/libraries/libldap/thr_debug.c index cce1001753..be8640a2a4 100644 --- a/libraries/libldap/thr_debug.c +++ b/libraries/libldap/thr_debug.c @@ -959,6 +959,22 @@ ldap_pvt_thread_cond_wait( return rc; } +int +ldap_pvt_thread_mutex_recursive_init( ldap_pvt_thread_mutex_t *mutex ) +{ + int rc; + init_usage( &mutex->usage, "ldap_pvt_thread_mutex_recursive_init" ); + rc = ldap_int_thread_mutex_recursive_init( WRAPPED( mutex ) ); + if( rc ) { + ERROR( rc, "ldap_pvt_thread_mutex_recursive_init" ); + destroy_usage( &mutex->usage ); + } else { + RESET_OWNER( mutex ); + adjust_count( Idx_mutex, +1 ); + } + return rc; +} + int ldap_pvt_thread_mutex_init( ldap_pvt_thread_mutex_t *mutex ) {