From ff6478bb4a894228a8959ede750da9d079c13c7b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell 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/smbd/process_thread.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/smbd/process_thread.c') diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index d02238c840..523c38f521 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -221,7 +221,7 @@ static int thread_mutex_unlock(smb_mutex_t *mutex, const char *name) /* rwlock init function for thread model */ -static int thread_rwlock_init(rwlock_t *rwlock, const char *name) +static int thread_rwlock_init(smb_rwlock_t *rwlock, const char *name) { pthread_rwlock_t m = PTHREAD_RWLOCK_INITIALIZER; rwlock->rwlock = memdup(&m, sizeof(m)); @@ -235,7 +235,7 @@ static int thread_rwlock_init(rwlock_t *rwlock, const char *name) /* rwlock destroy function for thread model */ -static int thread_rwlock_destroy(rwlock_t *rwlock, const char *name) +static int thread_rwlock_destroy(smb_rwlock_t *rwlock, const char *name) { return pthread_rwlock_destroy((pthread_rwlock_t *)rwlock->rwlock); } @@ -243,7 +243,7 @@ static int thread_rwlock_destroy(rwlock_t *rwlock, const char *name) /* rwlock lock for read function for thread model */ -static int thread_rwlock_lock_read(rwlock_t *rwlockP, const char *name) +static int thread_rwlock_lock_read(smb_rwlock_t *rwlockP, const char *name) { pthread_rwlock_t *rwlock = (pthread_rwlock_t *)rwlockP->rwlock; int rc; @@ -272,7 +272,7 @@ static int thread_rwlock_lock_read(rwlock_t *rwlockP, const char *name) /* rwlock lock for write function for thread model */ -static int thread_rwlock_lock_write(rwlock_t *rwlockP, const char *name) +static int thread_rwlock_lock_write(smb_rwlock_t *rwlockP, const char *name) { pthread_rwlock_t *rwlock = (pthread_rwlock_t *)rwlockP->rwlock; int rc; @@ -302,7 +302,7 @@ static int thread_rwlock_lock_write(rwlock_t *rwlockP, const char *name) /* rwlock unlock for thread model */ -static int thread_rwlock_unlock(rwlock_t *rwlock, const char *name) +static int thread_rwlock_unlock(smb_rwlock_t *rwlock, const char *name) { return pthread_rwlock_unlock((pthread_rwlock_t *)rwlock->rwlock); } -- cgit