From 32fda4fc64cceb8b0c268322edc9ce86cc9dfed0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 20 Nov 2018 15:54:28 +0100
Subject: [PATCH] s3:modules: 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>
---
 source3/modules/getdate.c    | 6 +++---
 source3/modules/getdate.y    | 6 +++---
 source3/modules/vfs_commit.c | 4 ++--
 source3/modules/vfs_zfsacl.c | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/source3/modules/getdate.c b/source3/modules/getdate.c
index ccc9b10e6f7..10e46789ccf 100644
--- a/source3/modules/getdate.c
+++ b/source3/modules/getdate.c
@@ -109,7 +109,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#if HAVE_STDLIB_H
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h> /* for `free'; used by Bison 1.27 */
 #endif
 
@@ -2535,7 +2535,7 @@ get_date (const char *p, const time_t *now)
   pc.local_zones_seen = 0;
   pc.zones_seen = 0;
 
-#if HAVE_STRUCT_TM_TM_ZONE
+#ifdef HAVE_STRUCT_TM_TM_ZONE
   pc.local_time_zone_table[0].name = tmp->tm_zone;
   pc.local_time_zone_table[0].type = tLOCAL_ZONE;
   pc.local_time_zone_table[0].value = tmp->tm_isdst;
@@ -2563,7 +2563,7 @@ get_date (const char *p, const time_t *now)
       }
   }
 #else
-#if HAVE_TZNAME
+#ifdef HAVE_TZNAME
   {
 # ifndef tzname
     extern char *tzname[];
diff --git a/source3/modules/getdate.y b/source3/modules/getdate.y
index 3ac9f26abfc..90b54a865cc 100644
--- a/source3/modules/getdate.y
+++ b/source3/modules/getdate.y
@@ -44,7 +44,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#if HAVE_STDLIB_H
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h> /* for `free'; used by Bison 1.27 */
 #endif
 
@@ -911,7 +911,7 @@ get_date (const char *p, const time_t *now)
   pc.local_zones_seen = 0;
   pc.zones_seen = 0;
 
-#if HAVE_STRUCT_TM_TM_ZONE
+#ifdef HAVE_STRUCT_TM_TM_ZONE
   pc.local_time_zone_table[0].name = tmp->tm_zone;
   pc.local_time_zone_table[0].type = tLOCAL_ZONE;
   pc.local_time_zone_table[0].value = tmp->tm_isdst;
@@ -939,7 +939,7 @@ get_date (const char *p, const time_t *now)
       }
   }
 #else
-#if HAVE_TZNAME
+#ifdef HAVE_TZNAME
   {
 # ifndef tzname
     extern char *tzname[];
diff --git a/source3/modules/vfs_commit.c b/source3/modules/vfs_commit.c
index a11f9e2f131..408c90c46a0 100644
--- a/source3/modules/vfs_commit.c
+++ b/source3/modules/vfs_commit.c
@@ -86,9 +86,9 @@ static int commit_do(
 		("%s: flushing %lu dirty bytes\n",
 		 MODULE, (unsigned long)c->dbytes));
 
-#if HAVE_FDATASYNC
+#if defined(HAVE_FDATASYNC)
         result = fdatasync(fd);
-#elif HAVE_FSYNC
+#elif defined(HAVE_FSYNC)
         result = fsync(fd);
 #else
 	DEBUG(0, ("%s: WARNING: no commit support on this platform\n",
diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index 43e41f95c1a..2c5d82ae207 100644
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -27,7 +27,7 @@
 #include "smbd/smbd.h"
 #include "nfs4_acls.h"
 
-#if HAVE_FREEBSD_SUNACL_H
+#ifdef HAVE_FREEBSD_SUNACL_H
 #include "sunacl.h"
 #endif