X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Flibldap_r%2Fthr_thr.c;h=7df2a85de47b3794b6792cbe836562bc7140a6d0;hb=17ae956518e4b011eb423f63fd1fd93402d0cf5c;hp=54f2b6ba94d89b2f34ca981bc4ec76ca853a2067;hpb=72ba4cfb715001d30a6e48a2d7012f060f29d684;p=openldap

diff --git a/libraries/libldap_r/thr_thr.c b/libraries/libldap_r/thr_thr.c
index 54f2b6ba94..7df2a85de4 100644
--- a/libraries/libldap_r/thr_thr.c
+++ b/libraries/libldap_r/thr_thr.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998,1999 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted only
@@ -11,10 +12,11 @@
 /* thr_thr.c - wrappers around solaris threads */
 
 #include "portable.h"
-#include "ldap_pvt_thread.h"
 
 #if defined( HAVE_THR )
 
+#include "ldap_pvt_thread.h"
+
 /*******************
  *                 *
  * Solaris Threads *
@@ -22,25 +24,32 @@
  *******************/
 
 int
-ldap_pvt_thread_initialize( void )
+ldap_int_thread_initialize( void )
 {
-#ifdef LDAP_THREAD_CONCURRENCY
-	thr_setconcurrency( LDAP_THREAD_CONCURRENCY );
-#endif
 	return 0;
 }
 
+int
+ldap_int_thread_destroy( void )
+{
+	return 0;
+}
+
+#ifdef LDAP_THREAD_HAVE_SETCONCURRENCY
 int
 ldap_pvt_thread_set_concurrency(int n)
 {
 	return thr_setconcurrency( n );
 }
+#endif
 
+#ifdef LDAP_THREAD_HAVE_GETCONCURRENCY
 int
 ldap_pvt_thread_get_concurrency(void)
 {
 	return thr_getconcurrency();
 }
+#endif
 
 int 
 ldap_pvt_thread_create( ldap_pvt_thread_t * thread, 
@@ -99,7 +108,7 @@ ldap_pvt_thread_cond_broadcast( ldap_pvt_thread_cond_t *cv )
 
 int 
 ldap_pvt_thread_cond_wait( ldap_pvt_thread_cond_t *cond, 
-			  ldap_pvt_thread_mutex_t *mutex )
+	ldap_pvt_thread_mutex_t *mutex )
 {
 	return( cond_wait( cond, mutex ) );
 }