s3:smbd: Use #ifdef instead of #if for config.h definitions
authorAndreas Schneider <asn@samba.org>
Tue, 20 Nov 2018 14:57:09 +0000 (15:57 +0100)
committerGary Lockyer <gary@samba.org>
Wed, 28 Nov 2018 22:19:24 +0000 (23:19 +0100)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
source3/smbd/oplock.c
source3/smbd/oplock_linux.c
source3/smbd/server.c

index a7ac8464891023189f706b1dd6ac8bbc24886833..426b9e7faeabe0bdcce1acfcb89faf283fe6c741 100644 (file)
@@ -1449,7 +1449,7 @@ void init_kernel_oplocks(struct smbd_server_connection *sconn)
 
        /* only initialize once */
        if (koplocks == NULL) {
-#if HAVE_KERNEL_OPLOCKS_LINUX
+#ifdef HAVE_KERNEL_OPLOCKS_LINUX
                koplocks = linux_init_kernel_oplocks(sconn);
 #endif
                sconn->oplocks.kernel_ops = koplocks;
index f5afdd81abdf79a072f3f8ca34e3ed5e0fec504c..76760ff0346f11118184da2a26a8bc7ec7d9907a 100644 (file)
@@ -23,7 +23,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 
-#if HAVE_KERNEL_OPLOCKS_LINUX
+#ifdef HAVE_KERNEL_OPLOCKS_LINUX
 
 #ifndef F_SETLEASE
 #define F_SETLEASE     1024
index ab7803258c8c8f94f9dde96b95067bebb37bd6ba..68cd1d7bd54cb071770cf6ef286cf1b8968184df 100644 (file)
@@ -181,7 +181,7 @@ static void msg_inject_fault(struct messaging_context *msg,
                return;
        }
 
-#if HAVE_STRSIGNAL
+#ifdef HAVE_STRSIGNAL
        DEBUG(0, ("Process %s requested injection of signal %d (%s)\n",
                  server_id_str_buf(src, &tmp), sig, strsignal(sig)));
 #else
@@ -1218,7 +1218,7 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
                char *sock_tok;
                const char *sock_ptr;
 
-#if HAVE_IPV6
+#ifdef HAVE_IPV6
                sock_addr = "::,0.0.0.0";
 #else
                sock_addr = "0.0.0.0";
@@ -1843,7 +1843,7 @@ extern void build_options(bool screen);
                become_daemon(Fork, no_process_group, log_stdout);
        }
 
-#if HAVE_SETPGID
+#ifdef HAVE_SETPGID
        /*
         * If we're interactive we want to set our own process group for
         * signal management.