diff options
author | Andrew Tridgell <tridge@samba.org> | 2003-12-16 03:45:04 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2003-12-16 03:45:04 +0000 |
commit | 1abd0be41e7dde4e2edda7fe4c77f231a1583fda (patch) | |
tree | 5f352c66a6356bb1f296bb1553b957da450bdaa8 /source4 | |
parent | e2ffb64d7a2bf8280b058ac3ce462d9cee281a98 (diff) | |
download | samba-1abd0be41e7dde4e2edda7fe4c77f231a1583fda.tar.gz samba-1abd0be41e7dde4e2edda7fe4c77f231a1583fda.tar.bz2 samba-1abd0be41e7dde4e2edda7fe4c77f231a1583fda.zip |
more mutex portability.
(This used to be commit 42dd8d888a1d4c09aebb199e8636f49df6d2e36a)
Diffstat (limited to 'source4')
-rw-r--r-- | source4/include/mutex.h | 10 | ||||
-rw-r--r-- | source4/lib/mutex.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/source4/include/mutex.h b/source4/include/mutex.h index ec1a7d285c..21e4f9f8a5 100644 --- a/source4/include/mutex.h +++ b/source4/include/mutex.h @@ -45,11 +45,11 @@ enum rwlock_id { RWLOCK_SMBD, /* global smbd lock */ #define MUTEX_LOCK(mutex, name) smb_mutex_lock(mutex, #name) #define MUTEX_UNLOCK(mutex, name) smb_mutex_unlock(mutex, #name) -#define RWLOCK_INIT(rwlock, name) rwlock_init(rwlock, #name) -#define RWLOCK_DESTROY(rwlock, name) rwlock_destroy(rwlock, #name) -#define RWLOCK_LOCK_WRITE(rwlock, name) rwlock_lock_write(rwlock, #name) -#define RWLOCK_LOCK_READ(rwlock, name) rwlock_lock_read(rwlock, #name) -#define RWLOCK_UNLOCK(rwlock, name) rwlock_unlock(rwlock, #name) +#define RWLOCK_INIT(rwlock, name) smb_rwlock_init(rwlock, #name) +#define RWLOCK_DESTROY(rwlock, name) smb_rwlock_destroy(rwlock, #name) +#define RWLOCK_LOCK_WRITE(rwlock, name) smb_rwlock_lock_write(rwlock, #name) +#define RWLOCK_LOCK_READ(rwlock, name) smb_rwlock_lock_read(rwlock, #name) +#define RWLOCK_UNLOCK(rwlock, name) smb_rwlock_unlock(rwlock, #name) diff --git a/source4/lib/mutex.c b/source4/lib/mutex.c index 8d1eee7828..25ea3c55ee 100644 --- a/source4/lib/mutex.c +++ b/source4/lib/mutex.c @@ -72,7 +72,7 @@ int smb_mutex_unlock(smb_mutex_t *mutex, const char *name) /* read/write lock routines */ -int rwlock_init(smb_rwlock_t *rwlock, const char *name) +int smb_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(smb_rwlock_t *rwlock, const char *name) return 0; } -int rwlock_destroy(smb_rwlock_t *rwlock, const char *name) +int smb_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(smb_rwlock_t *rwlock, const char *name) return 0; } -int rwlock_lock_write(smb_rwlock_t *rwlock, const char *name) +int smb_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(smb_rwlock_t *rwlock, const char *name) return 0; } -int rwlock_lock_read(smb_rwlock_t *rwlock, const char *name) +int smb_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(smb_rwlock_t *rwlock, const char *name) return 0; } -int rwlock_unlock(smb_rwlock_t *rwlock, const char *name) +int smb_rwlock_unlock(smb_rwlock_t *rwlock, const char *name) { if (mutex_handlers.ops.rwlock_unlock) { return mutex_handlers.ops.rwlock_unlock(rwlock, name); |