s3-system: move LOCK_ defines to lib/system.c

Guenther

diff --git a/source3/include/includes.h b/source3/include/includes.h
index f4cac1a88f3e23b2970d497094d4bcd4890329e7..7ebb81e6df87ce2672fa43fe843c6eef8b032c32 100644 (file)
--- 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 b6cc7a8b076a73ca4076a721e67050a717344ac3..74a8971c5386421f84a7818c62a7956f58f7d4e1 100644 (file)
--- 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.
 ********************************************************************/