diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-07-29 03:08:05 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-07-29 03:08:05 +0000 |
| commit | 64578c0589a3a741f81fb55c16eeb882128da00b (patch) | |
| tree | 8b650156e44e4d39af8625185d857a88789b8074 /source3/locking/locking_shm.c | |
| parent | c48b3fce6be6d5d952cbcda0ddae223dda5a576f (diff) | |
| download | samba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.gz samba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.bz2 samba-64578c0589a3a741f81fb55c16eeb882128da00b.zip | |
merge from the autoconf2 branch to the main branch
(This used to be commit 3bda7ac417107a7b01d91805ca71c4330657ed21)
Diffstat (limited to 'source3/locking/locking_shm.c')
| -rw-r--r-- | source3/locking/locking_shm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/locking/locking_shm.c b/source3/locking/locking_shm.c index afca567033..43a927e14c 100644 --- a/source3/locking/locking_shm.c +++ b/source3/locking/locking_shm.c @@ -32,9 +32,10 @@ October 1997 - split into separate file (tridge) */ +#include "includes.h" + #ifdef FAST_SHARE_MODES -#include "includes.h" extern int DEBUGLEVEL; extern connection_struct Connections[]; extern files_struct Files[]; @@ -678,13 +679,15 @@ struct share_ops *locking_shm_init(int ronly) { read_only = ronly; -#ifdef USE_SYSV_IPC +#ifdef HAVE_SYSV_IPC shmops = sysv_shm_open(read_only); if (shmops) return &share_ops; #endif +#ifdef HAVE_SHARED_MMAP shmops = smb_shm_open(read_only); if (shmops) return &share_ops; +#endif return NULL; } @@ -692,7 +695,7 @@ struct share_ops *locking_shm_init(int ronly) #else int locking_shm_dummy_procedure(void) {return 0;} -#endif +#endif /* FAST_SHARE_MODES */ |