The branch, v3-6-test has been updated via a99d25b s3-system: move LOCK_ defines to lib/system.c from 3bcdab2 s3-spoolss: remove another unused header.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit a99d25b3d2af71c0ec05484469a0943b74eb89c4 Author: Günther Deschner <g...@samba.org> Date: Tue May 3 14:45:47 2011 +0200 s3-system: move LOCK_ defines to lib/system.c Guenther (cherry picked from commit 4fa2bac6e7ebe11447b535d9c8ec4348a2bbd39e) ----------------------------------------------------------------------- Summary of changes: source3/include/includes.h | 9 --------- source3/lib/system.c | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/include/includes.h b/source3/include/includes.h index 04850f0..361bdd1 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -582,15 +582,6 @@ typedef char fstring[FSTRING_LEN]; #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 52b6477..4114ccc 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. ********************************************************************/ -- Samba Shared Repository