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 98f796e3fed1270ee6b86f7f729ba6285de012e3..d7535bf357a5c427f8fae6072d4a7d3468197116 100644 (file)
--- 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 e0aa5da07cb8f56e0755b1c76817fe654054d691..fd109a3eacdc7c25355d69e2a1c07f65ec20dcd0 100644 (file)
--- 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 2273ef74f32622c618f0f8d5faf679542cfcc82c..db87cb7fe153c720f4524985f1ebb0cee6516b76 100644 (file)
--- 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,