From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 3 Feb 1999 18:33:53 +0000 (+0000)
Subject: Import concurrency fix from devel.
X-Git-Tag: OPENLDAP_REL_ENG_1_2_BETA2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73b6d989edde35fd1e95354c8339d0a30caebbd8;p=thirdparty%2Fopenldap.git

Import concurrency fix from devel.
---

diff --git a/include/ldap_pvt_thread.h b/include/ldap_pvt_thread.h
index dd73e7fbfd..55f91dd733 100644
--- 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 09f283d829..c76286d136 100644
--- 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 df9c788fbb..88ea15b9ec 100644
--- 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 );