From f24c298f43a86d117314007246e1175af74a7d96 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Fri, 15 Aug 2003 17:13:41 +0000 Subject: rename mutex_t to smb_mutex_t to prevent name collision (This used to be commit d32f14959277a5b7d1302638b65ff1fc568f08a9) --- source4/smbd/process_thread.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/smbd/process_thread.c') diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index cd8865f1e4..346c362c5a 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -96,7 +96,7 @@ static void terminate_connection(struct server_context *server, const char *reas /* mutex init function for thread model */ -static int thread_mutex_init(mutex_t *mutex, const char *name) +static int thread_mutex_init(smb_mutex_t *mutex, const char *name) { pthread_mutex_t m = PTHREAD_MUTEX_INITIALIZER; mutex->mutex = memdup(&m, sizeof(m)); @@ -110,7 +110,7 @@ static int thread_mutex_init(mutex_t *mutex, const char *name) /* mutex destroy function for thread model */ -static int thread_mutex_destroy(mutex_t *mutex, const char *name) +static int thread_mutex_destroy(smb_mutex_t *mutex, const char *name) { return pthread_mutex_destroy((pthread_mutex_t *)mutex->mutex); } @@ -131,7 +131,7 @@ static double mutex_end_timer(struct timeval tp1) /* mutex lock function for thread model */ -static int thread_mutex_lock(mutex_t *mutexP, const char *name) +static int thread_mutex_lock(smb_mutex_t *mutexP, const char *name) { pthread_mutex_t *mutex = (pthread_mutex_t *)mutexP->mutex; int rc; @@ -160,7 +160,7 @@ static int thread_mutex_lock(mutex_t *mutexP, const char *name) /* mutex unlock for thread model */ -static int thread_mutex_unlock(mutex_t *mutex, const char *name) +static int thread_mutex_unlock(smb_mutex_t *mutex, const char *name) { return pthread_mutex_unlock((pthread_mutex_t *)mutex->mutex); } -- cgit