more mutex portability.

(This used to be commit 42dd8d888a1d4c09aebb199e8636f49df6d2e36a)

diff --git a/source4/include/mutex.h b/source4/include/mutex.h
index ec1a7d285c1b9d27ffaaa47c42d2e186e73f9df9..21e4f9f8a5c7c2ad6de1824d86676ecd8da8a3f2 100644 (file)
--- 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 8d1eee782811bd9193c79f288a93dcb2e7f6db63..25ea3c55eeaee231314ad084159cb625f3e2c616 100644 (file)
--- 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);