Import concurrency fix from devel.

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index dd73e7fbfd11adc6281943e6d3b599ffebb27a10..55f91dd733523e467357edf324d38ffba03f980d 100644 (file)
--- a/include/ldap_pvt_thread.h
+++ b/include/ldap_pvt_thread.h
@@ -169,7 +169,7 @@ ldap_pvt_thread_sleep LDAP_P(( unsigned int s ));
 
 #ifdef HAVE_GETCONCURRENCY
 LDAP_F int
-ldap_pvt_thread_getconcurrency LDAP_P(( void ));
+ldap_pvt_thread_get_concurrency LDAP_P(( void ));
 #endif
 #ifdef HAVE_SETCONCURRENCY
 #      ifndef LDAP_THREAD_CONCURRENCY
@@ -177,7 +177,7 @@ ldap_pvt_thread_getconcurrency LDAP_P(( void ));
 #      define LDAP_THREAD_CONCURRENCY  3
 #      endif
 LDAP_F int
-ldap_pvt_thread_setconcurrency LDAP_P(( int ));
+ldap_pvt_thread_set_concurrency LDAP_P(( int ));
 #endif
 
 LDAP_F int 

diff --git a/libraries/liblthread/thr_posix.c b/libraries/liblthread/thr_posix.c
index 09f283d829d16158362d8b010292a56f9bbd600d..c76286d136dffe867bca700d5e8cd21c43334176 100644 (file)
--- a/libraries/liblthread/thr_posix.c
+++ b/libraries/liblthread/thr_posix.c
@@ -20,7 +20,7 @@ int
 ldap_pvt_thread_initialize( void )
 {
 #if defined( LDAP_THREAD_CONCURRENCY ) && HAVE_PTHREAD_SETCONCURRENCY
-       ldap_pvt_thread_setconcurrency( LDAP_THREAD_CONCURRENCY );
+       ldap_pvt_thread_set_concurrency( LDAP_THREAD_CONCURRENCY );
 #endif
        return 0;
 }

diff --git a/servers/slapd/monitor.c b/servers/slapd/monitor.c
index df9c788fbb908b8dad09af4905713546667b6479..88ea15b9ecf1fdaebee47a52b3aa0a3cd92f8c11 100644 (file)
--- a/servers/slapd/monitor.c
+++ b/servers/slapd/monitor.c
@@ -179,7 +179,7 @@ monitor_info( Connection *conn, Operation *op )
        attr_merge( e, "nbackends", vals );
 
 #ifdef HAVE_THREAD_CONCURRENCY
-       sprintf( buf, "%d", ldap_pvt_thread_getconcurrency() );
+       sprintf( buf, "%d", ldap_pvt_thread_get_concurrency() );
        val.bv_val = buf;
        val.bv_len = strlen( buf );
        attr_merge( e, "concurrency", vals );