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/include/mutex.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/include') diff --git a/source4/include/mutex.h b/source4/include/mutex.h index c3e146d415..c7c58b36a0 100644 --- a/source4/include/mutex.h +++ b/source4/include/mutex.h @@ -57,7 +57,7 @@ enum rwlock_id { RWLOCK_SMBD, /* global smbd lock */ pitfalls of void* */ typedef struct { void *mutex; -} mutex_t; +} smb_mutex_t; typedef struct { void *rwlock; } rwlock_t; @@ -65,10 +65,10 @@ typedef struct { /* the mutex model operations structure - contains function pointers to the model-specific implementations of each operation */ struct mutex_ops { - int (*mutex_init)(mutex_t *mutex, const char *name); - int (*mutex_lock)(mutex_t *mutex, const char *name); - int (*mutex_unlock)(mutex_t *mutex, const char *name); - int (*mutex_destroy)(mutex_t *mutex, const char *name); + int (*mutex_init)(smb_mutex_t *mutex, const char *name); + int (*mutex_lock)(smb_mutex_t *mutex, const char *name); + int (*mutex_unlock)(smb_mutex_t *mutex, const char *name); + int (*mutex_destroy)(smb_mutex_t *mutex, const char *name); int (*rwlock_init)(rwlock_t *rwlock, const char *name); int (*rwlock_lock_write)(rwlock_t *rwlock, const char *name); int (*rwlock_lock_read)(rwlock_t *rwlock, const char *name); -- cgit