diff options
| author | Günther Deschner <gd@samba.org> | 2011-05-03 14:45:47 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-05-03 21:03:47 +0200 |
| commit | 4fa2bac6e7ebe11447b535d9c8ec4348a2bbd39e (patch) | |
| tree | b872f3dac242763a2da63bab030e04b437a43c69 | |
| parent | 023260487517e835edd7f16c8485f9e84cf44667 (diff) | |
| download | samba-4fa2bac6e7ebe11447b535d9c8ec4348a2bbd39e.tar.gz samba-4fa2bac6e7ebe11447b535d9c8ec4348a2bbd39e.tar.bz2 samba-4fa2bac6e7ebe11447b535d9c8ec4348a2bbd39e.zip | |
s3-system: move LOCK_ defines to lib/system.c
Guenther
| -rw-r--r-- | source3/include/includes.h | 9 | ||||
| -rw-r--r-- | source3/lib/system.c | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index f4cac1a88f..7ebb81e6df 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -602,15 +602,6 @@ enum flush_reason_enum { #endif -#if HAVE_KERNEL_SHARE_MODES -#ifndef LOCK_MAND -#define LOCK_MAND 32 /* This is a mandatory flock */ -#define LOCK_READ 64 /* ... Which allows concurrent read operations */ -#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */ -#define LOCK_RW 192 /* ... Which allows concurrent read & write ops */ -#endif -#endif - #define MAX_SEC_CTX_DEPTH 8 /* Maximum number of security contexts */ diff --git a/source3/lib/system.c b/source3/lib/system.c index b6cc7a8b07..74a8971c53 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -833,6 +833,15 @@ FILE *sys_fopen(const char *path, const char *type) } +#if HAVE_KERNEL_SHARE_MODES +#ifndef LOCK_MAND +#define LOCK_MAND 32 /* This is a mandatory flock */ +#define LOCK_READ 64 /* ... Which allows concurrent read operations */ +#define LOCK_WRITE 128 /* ... Which allows concurrent write operations */ +#define LOCK_RW 192 /* ... Which allows concurrent read & write ops */ +#endif +#endif + /******************************************************************* A flock() wrapper that will perform the kernel flock. ********************************************************************/ |