From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 8 Jun 2000 00:29:32 +0000 (+0000)
Subject: Really disable pthread rw locks
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2709
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e68b429d45695f887f2ca822c6cbb1ad69d66c3c;p=openldap

Really disable pthread rw locks
---

diff --git a/include/ldap_int_thread.h b/include/ldap_int_thread.h
index 405f20d1b8..034f44e4d1 100644
--- a/include/ldap_int_thread.h
+++ b/include/ldap_int_thread.h
@@ -49,7 +49,7 @@ typedef pthread_cond_t		ldap_int_thread_cond_t;
 #define HAVE_SETCONCURRENCY 1
 #endif
 
-#if defined( HAVE_PTHREAD_RWLOCK_DESTROY )
+#if 0 && defined( HAVE_PTHREAD_RWLOCK_DESTROY )
 #define LDAP_THREAD_HAVE_RDWR 1
 typedef pthread_rwlock_t ldap_pvt_thread_rdwr_t;
 #endif
diff --git a/libraries/libldap_r/thr_posix.c b/libraries/libldap_r/thr_posix.c
index f6a16c5d2a..bb1fdb279f 100644
--- a/libraries/libldap_r/thr_posix.c
+++ b/libraries/libldap_r/thr_posix.c
@@ -218,6 +218,7 @@ ldap_int_thread_mutex_unlock( ldap_int_thread_mutex_t *mutex )
 	return pthread_mutex_unlock( mutex );
 }
 
+#ifdef LDAP_THREAD_HAVE_RDWR
 #ifdef HAVE_PTHREAD_RWLOCK_DESTROY
 int 
 ldap_pvt_thread_rdwr_init( ldap_pvt_thread_rdwr_t *rw )
@@ -261,6 +262,7 @@ int ldap_pvt_thread_rdwr_wunlock( ldap_pvt_thread_rdwr_t *rw )
 	return pthread_rwlock_unlock( rw );
 }
 
+#endif /* HAVE_PTHREAD_RDLOCK_DESTROY */
 #endif /* LDAP_THREAD_HAVE_RDWR */
 #endif /* HAVE_PTHREADS */