s3: Remove unsused MMAP_BLACKLIST ifdef checks
authorAndreas Schneider <asn@samba.org>
Tue, 20 Nov 2018 11:06:13 +0000 (12:06 +0100)
committerGary Lockyer <gary@samba.org>
Wed, 28 Nov 2018 22:19:21 +0000 (23:19 +0100)
This doesn't get defined by anything.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
lib/replace/replace.h
source3/include/includes.h
source3/param/loadparm.c

index a6cafc1..ece71b7 100644 (file)
@@ -832,10 +832,6 @@ typedef unsigned long long ptrdiff_t ;
  */
 #define PTR_DIFF(p1,p2) ((ptrdiff_t)(((const char *)(p1)) - (const char *)(p2)))
 
-#if MMAP_BLACKLIST
-#undef HAVE_MMAP
-#endif
-
 #ifdef __COMPAR_FN_T
 #define QSORT_CAST (__compar_fn_t)
 #endif
index 9c47c34..0327760 100644 (file)
@@ -362,13 +362,6 @@ char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATT
 #endif
 #define FALSE __ERROR__XX__DONT_USE_FALSE
 
-/* If we have blacklisted mmap() try to avoid using it accidentally by
-   undefining the HAVE_MMAP symbol. */
-
-#ifdef MMAP_BLACKLIST
-#undef HAVE_MMAP
-#endif
-
 void dump_core(void) _NORETURN_;
 void exit_server(const char *const reason) _NORETURN_;
 void exit_server_cleanly(const char *const reason) _NORETURN_;
index 994f9b0..d8be520 100644 (file)
@@ -712,11 +712,7 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
        Globals.oplock_break_wait_time = 0;     /* By Default, 0 msecs. */
        Globals.enhanced_browsing = true;
        Globals.lock_spin_time = WINDOWS_MINIMUM_LOCK_TIMEOUT_MS; /* msec. */
-#ifdef MMAP_BLACKLIST
-       Globals.use_mmap = false;
-#else
        Globals.use_mmap = true;
-#endif
        Globals.unicode = true;
        Globals.unix_extensions = true;
        Globals.reset_on_zero_vc = false;