tdb2: use ccan/endian

This is where we should be getting bswap_64 from.

diff --git a/ccan/tdb2/_info b/ccan/tdb2/_info
index a6d4ec7dc1b27d5512675f603178aea192b4bf29..884916ab02b6fdcedc879fa47bd7943c0442b578 100644 (file)
--- a/ccan/tdb2/_info
+++ b/ccan/tdb2/_info
@@ -83,6 +83,7 @@ int main(int argc, char *argv[])
                printf("ccan/tally\n");
                printf("ccan/typesafe_cb\n");
                printf("ccan/cast\n");
                printf("ccan/tally\n");
                printf("ccan/typesafe_cb\n");
                printf("ccan/cast\n");

+               printf("ccan/endian\n");

                return 0;
        }
 
                return 0;
        }
 

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 7b79cc3eefced99d4ba84a4820e0d31735227dd3..1650cf833d7988599e1d73e55181ed9317bbb1c6 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -38,9 +38,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>

-#if HAVE_BYTESWAP_H
-#include <byteswap.h>
-#endif
+#include <ccan/endian/endian.h>

 
 #ifndef TEST_IT
 #define TEST_IT(cond)
 
 #ifndef TEST_IT
 #define TEST_IT(cond)


@@ -137,20 +135,6 @@ typedef int tdb_bool_err;
 /* Indicates this entry is not on an flist (can happen during coalescing) */
 #define TDB_FTABLE_NONE ((1ULL << TDB_OFF_UPPER_STEAL) - 1)
 
 /* Indicates this entry is not on an flist (can happen during coalescing) */
 #define TDB_FTABLE_NONE ((1ULL << TDB_OFF_UPPER_STEAL) - 1)
 

-#if !HAVE_BSWAP_64
-static inline uint64_t bswap_64(uint64_t x)
-{
-       return (((x&0x000000FFULL)<<56)
-               | ((x&0x0000FF00ULL)<<48)
-               | ((x&0x00FF0000ULL)<<40)
-               | ((x&0xFF000000ULL)<<32)
-               | ((x>>8)&0xFF000000ULL)
-               | ((x>>16)&0x00FF0000ULL)
-               | ((x>>24)&0x0000FF00ULL)
-               | ((x>>32)&0x000000FFULL));
-}
-#endif
-

 struct tdb_used_record {
        /* For on-disk compatibility, we avoid bitfields:
           magic: 16,        (highest)
 struct tdb_used_record {
        /* For on-disk compatibility, we avoid bitfields:
           magic: 16,        (highest)