From ff6478bb4a894228a8959ede750da9d079c13c7b Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 16 Dec 2003 03:27:36 +0000
Subject: use smb_rwlock_t instead of rwlock_t to avoid conflicts with system
 types on some platforms (eg. solaris) (This used to be commit
 ac8a23af8c67d2e39bb6cfd409c50f1f429cf271)

---
 source4/lib/mutex.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/lib/mutex.c')

diff --git a/source4/lib/mutex.c b/source4/lib/mutex.c
index 18b7e08b5a..c1a0986040 100644
--- a/source4/lib/mutex.c
+++ b/source4/lib/mutex.c
@@ -72,7 +72,7 @@ int mutex_unlock(smb_mutex_t *mutex, const char *name)
 
 /* read/write lock routines */
 
-int rwlock_init(rwlock_t *rwlock, const char *name)
+int rwlock_init(smb_rwlock_t *rwlock, const char *name)
 {
 	if (mutex_handlers.ops.rwlock_init) {
 		return mutex_handlers.ops.rwlock_init(rwlock, name);
@@ -80,7 +80,7 @@ int rwlock_init(rwlock_t *rwlock, const char *name)
 	return 0;
 }
 
-int rwlock_destroy(rwlock_t *rwlock, const char *name)
+int rwlock_destroy(smb_rwlock_t *rwlock, const char *name)
 {
 	if (mutex_handlers.ops.rwlock_destroy) {
 		return mutex_handlers.ops.rwlock_destroy(rwlock, name);
@@ -88,7 +88,7 @@ int rwlock_destroy(rwlock_t *rwlock, const char *name)
 	return 0;
 }
 
-int rwlock_lock_write(rwlock_t *rwlock, const char *name)
+int rwlock_lock_write(smb_rwlock_t *rwlock, const char *name)
 {
 	if (mutex_handlers.ops.rwlock_lock_write) {
 		return mutex_handlers.ops.rwlock_lock_write(rwlock, name);
@@ -96,7 +96,7 @@ int rwlock_lock_write(rwlock_t *rwlock, const char *name)
 	return 0;
 }
 
-int rwlock_lock_read(rwlock_t *rwlock, const char *name)
+int rwlock_lock_read(smb_rwlock_t *rwlock, const char *name)
 {
 	if (mutex_handlers.ops.rwlock_lock_read) {
 		return mutex_handlers.ops.rwlock_lock_read(rwlock, name);
@@ -104,7 +104,7 @@ int rwlock_lock_read(rwlock_t *rwlock, const char *name)
 	return 0;
 }
 
-int rwlock_unlock(rwlock_t *rwlock, const char *name)
+int rwlock_unlock(smb_rwlock_t *rwlock, const char *name)
 {
 	if (mutex_handlers.ops.rwlock_unlock) {
 		return mutex_handlers.ops.rwlock_unlock(rwlock, name);
-- 
cgit