From 6aa6dce3f7c4303d184b3098fbf4619e49a27e45 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 10 Feb 2005 07:18:00 +0000 Subject: r5306: removed all the unused mutex functions from mutex.c. When (if?) we decide to reinstate the mutex code for the threads process model, I'd like to do it a little differently. At least this gets it out of includes.h for now. (This used to be commit cfee0fb02e10add22b6c436bdfa95d1a8f5f3def) --- source4/include/includes.h | 1 - source4/include/mutex.h | 12 +----------- source4/include/structs.h | 2 ++ 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'source4/include') diff --git a/source4/include/includes.h b/source4/include/includes.h index b31ba4d840..3387102393 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -124,7 +124,6 @@ extern int errno; #include "smb.h" #include "byteorder.h" #include "module.h" -#include "mutex.h" #include "librpc/ndr/libndr.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_dcerpc.h" diff --git a/source4/include/mutex.h b/source4/include/mutex.h index 21e4f9f8a5..c0b7d26744 100644 --- a/source4/include/mutex.h +++ b/source4/include/mutex.h @@ -21,16 +21,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* To add a new mutex, add it to enum mutex_id - */ -enum mutex_id { MUTEX_SMBD, /* global smbd lock */ - MUTEX_TALLOC, /* global talloc.c lock */ - MUTEX_DEBUG, /* global debug.c lock */ - MUTEX_TANK, /* vfs_tank lock */ - - MUTEX_MAX /* this MUST be kept last */ -}; - /* To add a new read/write lock, add it to enum rwlock_id */ enum rwlock_id { RWLOCK_SMBD, /* global smbd lock */ @@ -55,7 +45,7 @@ enum rwlock_id { RWLOCK_SMBD, /* global smbd lock */ /* this null typedef ensures we get the types right and avoids the pitfalls of void* */ -typedef struct { +typedef struct smb_mutex { void *mutex; } smb_mutex_t; typedef struct { diff --git a/source4/include/structs.h b/source4/include/structs.h index 29d552d3cc..034ad20b64 100644 --- a/source4/include/structs.h +++ b/source4/include/structs.h @@ -172,3 +172,5 @@ struct stream_server_ops; struct nbtd_server; struct nbtd_interface; + +struct mutex_ops; -- cgit