From: Andreas Schneider <asn@samba.org>
Date: Wed, 21 Nov 2018 10:33:51 +0000 (+0100)
Subject: s4:lib: Use #ifdef instead of #if for config.h definitions
X-Git-Tag: tdb-1.3.17~547
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=788d9f31d5c5def8a042a937b730b5be31543809;p=thirdparty%2Fsamba.git

s4:lib: 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/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index 98f796e3fed..d7535bf357a 100644
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -619,7 +619,7 @@ _PUBLIC_ const struct socket_ops *socket_getops_byname(const char *family, enum
 		return socket_ipv4_ops(type);
 	}
 
-#if HAVE_IPV6
+#ifdef HAVE_IPV6
 	if (strcmp("ipv6", family) == 0) {
 		return socket_ipv6_ops(type);
 	}
diff --git a/source4/lib/socket/socket_ip.c b/source4/lib/socket/socket_ip.c
index e0aa5da07cb..fd109a3eacd 100644
--- a/source4/lib/socket/socket_ip.c
+++ b/source4/lib/socket/socket_ip.c
@@ -557,7 +557,7 @@ _PUBLIC_ const struct socket_ops *socket_ipv4_ops(enum socket_type type)
 	return &ipv4_ops;
 }
 
-#if HAVE_IPV6
+#ifdef HAVE_IPV6
 
 static struct in6_addr interpret_addr6(const char *name)
 {
diff --git a/source4/lib/tls/tlscert.c b/source4/lib/tls/tlscert.c
index 2273ef74f32..db87cb7fe15 100644
--- a/source4/lib/tls/tlscert.c
+++ b/source4/lib/tls/tlscert.c
@@ -103,7 +103,7 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx,
 	TLSCHECK(gnutls_x509_crt_set_key_usage(cacrt, GNUTLS_KEY_KEY_CERT_SIGN | GNUTLS_KEY_CRL_SIGN));
 	TLSCHECK(gnutls_x509_crt_set_version(cacrt, 3));
 	TLSCHECK(gnutls_x509_crt_get_key_id(cacrt, 0, keyid, &keyidsize));
-#if HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID
+#ifdef HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID
 	TLSCHECK(gnutls_x509_crt_set_subject_key_id(cacrt, keyid, keyidsize));
 #endif
 	TLSCHECK(gnutls_x509_crt_sign2(cacrt, cacrt, cakey,
@@ -130,7 +130,7 @@ void tls_cert_generate(TALLOC_CTX *mem_ctx,
 #endif
 	TLSCHECK(gnutls_x509_crt_set_version(crt, 3));
 	TLSCHECK(gnutls_x509_crt_get_key_id(crt, 0, keyid, &keyidsize));
-#if HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID
+#ifdef HAVE_GNUTLS_X509_CRT_SET_SUBJECT_KEY_ID
 	TLSCHECK(gnutls_x509_crt_set_subject_key_id(crt, keyid, keyidsize));
 #endif
 	TLSCHECK(gnutls_x509_crt_sign2(crt, crt, key,