diff options
| author | Andrew Tridgell <tridge@samba.org> | 2003-12-16 03:27:36 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2003-12-16 03:27:36 +0000 |
| commit | ff6478bb4a894228a8959ede750da9d079c13c7b (patch) | |
| tree | 510ea0e4c4e6417984a09c555e8066c65099532a /source4/include | |
| parent | 6deece83dc9b115fb340b0b8173526602a7dd86d (diff) | |
| download | samba-ff6478bb4a894228a8959ede750da9d079c13c7b.tar.gz samba-ff6478bb4a894228a8959ede750da9d079c13c7b.tar.bz2 samba-ff6478bb4a894228a8959ede750da9d079c13c7b.zip | |
use smb_rwlock_t instead of rwlock_t to avoid conflicts with system
types on some platforms (eg. solaris)
(This used to be commit ac8a23af8c67d2e39bb6cfd409c50f1f429cf271)
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/mutex.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/include/mutex.h b/source4/include/mutex.h index c7c58b36a0..20caaf5aa2 100644 --- a/source4/include/mutex.h +++ b/source4/include/mutex.h @@ -60,7 +60,7 @@ typedef struct { } smb_mutex_t; typedef struct { void *rwlock; -} rwlock_t; +} smb_rwlock_t; /* the mutex model operations structure - contains function pointers to the model-specific implementations of each operation */ @@ -69,11 +69,11 @@ struct mutex_ops { 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); - int (*rwlock_unlock)(rwlock_t *rwlock, const char *name); - int (*rwlock_destroy)(rwlock_t *rwlock, const char *name); + int (*rwlock_init)(smb_rwlock_t *rwlock, const char *name); + int (*rwlock_lock_write)(smb_rwlock_t *rwlock, const char *name); + int (*rwlock_lock_read)(smb_rwlock_t *rwlock, const char *name); + int (*rwlock_unlock)(smb_rwlock_t *rwlock, const char *name); + int (*rwlock_destroy)(smb_rwlock_t *rwlock, const char *name); }; #endif /* ndef _MUTEX_H_ */ |