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

replace: 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/lib/replace/getifaddrs.c b/lib/replace/getifaddrs.c
index 9e377e5edc0..a55ef7e30fe 100644
--- a/lib/replace/getifaddrs.c
+++ b/lib/replace/getifaddrs.c
@@ -73,7 +73,7 @@ static struct sockaddr *sockaddr_dup(struct sockaddr *sa)
 }
 #endif
 
-#if HAVE_IFACE_IFCONF
+#ifdef HAVE_IFACE_IFCONF
 
 /* this works for Linux 2.2, Solaris 2.5, SunOS4, HPUX 10.20, OSF1
    V4.0, Ultrix 4.4, SCO Unix 3.2, IRIX 6.4 and FreeBSD 3.2.
diff --git a/lib/replace/system/dir.h b/lib/replace/system/dir.h
index 0955b193958..497b5a7c0fa 100644
--- a/lib/replace/system/dir.h
+++ b/lib/replace/system/dir.h
@@ -25,7 +25,7 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#if HAVE_DIRENT_H
+#ifdef HAVE_DIRENT_H
 # include <dirent.h>
 # define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
@@ -46,7 +46,7 @@
 #define mkdir(dir, mode) mkdir(dir)
 #endif
 
-#if HAVE_LIBGEN_H
+#ifdef HAVE_LIBGEN_H
 # include <libgen.h>
 #endif
 
diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h
index faa94c73f26..b9ce41a4b38 100644
--- a/lib/replace/system/filesys.h
+++ b/lib/replace/system/filesys.h
@@ -115,16 +115,16 @@
 #define VXFS_QUOTA
 #endif
 
-#if HAVE_SYS_ATTRIBUTES_H
+#if defined(HAVE_SYS_ATTRIBUTES_H)
 #include <sys/attributes.h>
-#elif HAVE_ATTR_ATTRIBUTES_H
+#elif defined(HAVE_ATTR_ATTRIBUTES_H)
 #include <attr/attributes.h>
 #endif
 
 /* mutually exclusive (SuSE 8.2) */
-#if HAVE_ATTR_XATTR_H
+#if defined(HAVE_ATTR_XATTR_H)
 #include <attr/xattr.h>
-#elif HAVE_SYS_XATTR_H
+#elif defined(HAVE_SYS_XATTR_H)
 #include <sys/xattr.h>
 #endif
 
diff --git a/lib/replace/system/gssapi.h b/lib/replace/system/gssapi.h
index 6386c7b21a3..9e68dcc1c88 100644
--- a/lib/replace/system/gssapi.h
+++ b/lib/replace/system/gssapi.h
@@ -39,11 +39,11 @@
 #include <gssapi.h>
 #endif
 
-#if HAVE_GSSAPI_GSSAPI_KRB5_H
+#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
 #include <gssapi/gssapi_krb5.h>
 #endif
 
-#if HAVE_GSSAPI_GSSAPI_SPNEGO_H
+#ifdef HAVE_GSSAPI_GSSAPI_SPNEGO_H
 #include <gssapi/gssapi_spnego.h>
 #elif HAVE_GSSAPI_SPNEGO_H
 #include <gssapi_spnego.h>
diff --git a/lib/replace/system/kerberos.h b/lib/replace/system/kerberos.h
index 636ce0f2e0b..ebd8657e612 100644
--- a/lib/replace/system/kerberos.h
+++ b/lib/replace/system/kerberos.h
@@ -29,11 +29,11 @@
 
 #ifdef HAVE_KRB5
 
-#if HAVE_KRB5_H
+#ifdef HAVE_KRB5_H
 #include <krb5.h>
 #endif
 
-#if HAVE_COM_ERR_H
+#ifdef HAVE_COM_ERR_H
 #include <com_err.h>
 #endif