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

[ccan] / ccan / tdb2 / io.c

diff --git a/ccan/tdb2/io.c b/ccan/tdb2/io.c
index ae09597ec4eecacaf362f7c9af616103d9857f1f..3a261a4053ec9fb369077664c66c88ed69e484b8 100644 (file)
--- a/ccan/tdb2/io.c
+++ b/ccan/tdb2/io.c
@@ -552,7 +552,7 @@ int tdb_access_commit(struct tdb_context *tdb, void *p)
 }
 
 static void *tdb_direct(struct tdb_context *tdb, tdb_off_t off, size_t len,
-                       bool write)
+                       bool write_mode)
 {
        if (unlikely(!tdb->map_ptr))
                return NULL;
@@ -562,10 +562,10 @@ static void *tdb_direct(struct tdb_context *tdb, tdb_off_t off, size_t len,
        return (char *)tdb->map_ptr + off;
 }
 
-void add_stat_(struct tdb_context *tdb, uint64_t *stat, size_t val)
+void add_stat_(struct tdb_context *tdb, uint64_t *s, size_t val)
 {
-       if ((uintptr_t)stat < (uintptr_t)tdb->stats + tdb->stats->size)
-               *stat += val;
+       if ((uintptr_t)s < (uintptr_t)tdb->stats + tdb->stats->size)
+               *s += val;
 }
 
 static const struct tdb_methods io_methods = {