compiler, talloc, tap, tdb2: use #if instead of #ifdef.

diff --git a/ccan/compiler/test/run-is_compile_constant.c b/ccan/compiler/test/run-is_compile_constant.c
index 0a15280b61635db92b782aa1eea01f7ed91b2aa3..a66f2e13e6c9c3749ae9357cb800517377d5863c 100644 (file)
--- a/ccan/compiler/test/run-is_compile_constant.c
+++ b/ccan/compiler/test/run-is_compile_constant.c
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
        plan_tests(2);
 
        ok1(!IS_COMPILE_CONSTANT(argc));
        plan_tests(2);
 
        ok1(!IS_COMPILE_CONSTANT(argc));

-#ifdef HAVE_BUILTIN_CONSTANT_P
+#if HAVE_BUILTIN_CONSTANT_P

        ok1(IS_COMPILE_CONSTANT(7));
 #else
        pass("If !HAVE_BUILTIN_CONSTANT_P, IS_COMPILE_CONSTANT always false");
        ok1(IS_COMPILE_CONSTANT(7));
 #else
        pass("If !HAVE_BUILTIN_CONSTANT_P, IS_COMPILE_CONSTANT always false");

diff --git a/ccan/talloc/talloc.h b/ccan/talloc/talloc.h
index 59c132edc3a90021745f3be92a7807593cb38e65..b1b5e9ac461836737fed14a2a97f77c67d68af2d 100644 (file)
--- a/ccan/talloc/talloc.h
+++ b/ccan/talloc/talloc.h
@@ -276,7 +276,7 @@ int talloc_free(const void *ptr);
  */
 #define talloc_size(ctx, size) talloc_named_const(ctx, size, __location__)
 
  */
 #define talloc_size(ctx, size) talloc_named_const(ctx, size, __location__)
 

-#ifdef HAVE_TYPEOF
+#if HAVE_TYPEOF

 /**
  * talloc_steal - change/set the parent context of a talloc pointer
  * @ctx: the new parent
 /**
  * talloc_steal - change/set the parent context of a talloc pointer
  * @ctx: the new parent

diff --git a/ccan/tap/tap.c b/ccan/tap/tap.c
index 106da912487ba28665fc82d9f206e4c639085a34..9c92f7f21deb92c75ffe016f4c8e18a54b65f69b 100644 (file)
--- a/ccan/tap/tap.c
+++ b/ccan/tap/tap.c
@@ -49,7 +49,7 @@ static int test_pid;
 
 /* Encapsulate the pthread code in a conditional.  In the absence of
    libpthread the code does nothing */
 
 /* Encapsulate the pthread code in a conditional.  In the absence of
    libpthread the code does nothing */

-#ifdef HAVE_LIBPTHREAD
+#if HAVE_LIBPTHREAD

 #include <pthread.h>
 static pthread_mutex_t M = PTHREAD_MUTEX_INITIALIZER;
 # define LOCK pthread_mutex_lock(&M)
 #include <pthread.h>
 static pthread_mutex_t M = PTHREAD_MUTEX_INITIALIZER;
 # define LOCK pthread_mutex_lock(&M)

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 09f447f9221d179377d3e25bddae3a45977c49b1..de832af667402eb3efb609954fcaaf77fd61c98b 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -37,7 +37,7 @@
 #include <ccan/tdb2/tdb2.h>
 #include <ccan/likely/likely.h>
 #include <ccan/compiler/compiler.h>
 #include <ccan/tdb2/tdb2.h>
 #include <ccan/likely/likely.h>
 #include <ccan/compiler/compiler.h>

-#ifdef HAVE_BYTESWAP_H
+#if HAVE_BYTESWAP_H

 #include <byteswap.h>
 #endif
 
 #include <byteswap.h>
 #endif