From: Bradley Nicholes <bnicholes@apache.org>
Date: Fri, 8 Feb 2002 18:32:50 +0000 (+0000)
Subject: Updated to use the newer locking API's.  This file should probably be moved
X-Git-Tag: 2.0.32~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9998aa77b5f698243961573079adbad140904d0;p=apache

Updated to use the newer locking API's.  This file should probably be moved
to the httpd-ldap with the rest of the auth_ldap stuff.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93339 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/include/util_ldap.h b/include/util_ldap.h
index a0182724cf..fc6d6b7ea7 100644
--- a/include/util_ldap.h
+++ b/include/util_ldap.h
@@ -61,7 +61,8 @@
 #ifdef APU_HAS_LDAP
 
 /* APR header files */
-#include <apr_lock.h>
+#include <apr_thread_mutex.h>
+#include <apr_thread_rwlock.h>
 #include <apr_tables.h>
 #include <apr_time.h>
 
@@ -91,7 +92,7 @@ typedef enum {
 typedef struct util_ldap_connection_t {
     LDAP *ldap;
     apr_pool_t *pool;			/* Pool from which this connection is created */
-    apr_lock_t *lock;			/* Lock to indicate this connection is in use */
+    apr_thread_mutex_t *lock;			/* Lock to indicate this connection is in use */
     int bound;				/* Flag to indicate whether this connection is bound yet */
 
     const char *host;				/* Name of the LDAP server (or space separated list) */
@@ -115,7 +116,7 @@ typedef struct util_ldap_connection_t {
 /* LDAP cache state information */ 
 typedef struct util_ldap_state_t {
     apr_pool_t *pool;		/* pool from which this state is allocated */
-    apr_lock_t *mutex;		/* mutex lock for the connection list */
+    apr_thread_mutex_t *mutex;		/* mutex lock for the connection list */
 
     apr_size_t cache_bytes;	/* Size (in bytes) of shared memory cache */
     long search_cache_ttl;	/* TTL for search cache */