From: Andreas Schneider <asn@samba.org>
Date: Tue, 20 Nov 2018 14:57:09 +0000 (+0100)
Subject: s3:smbd: Use #ifdef instead of #if for config.h definitions
X-Git-Tag: tdb-1.3.17~550
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95432e30e9b2f1aa4832b045ff70bac3853f4d17;p=thirdparty%2Fsamba.git

s3:smbd: Use #ifdef instead of #if for config.h definitions

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
---

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index a7ac8464891..426b9e7faea 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -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;
diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c
index f5afdd81abd..76760ff0346 100644
--- a/source3/smbd/oplock_linux.c
+++ b/source3/smbd/oplock_linux.c
@@ -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
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index ab7803258c8..68cd1d7bd54 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -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.