From a8bb84de3dd8b14701c96e02da669abd8ac525ff Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 17 Jun 2011 12:27:44 +0930 Subject: [PATCH] tdb2: use ccan/endian This is where we should be getting bswap_64 from. --- ccan/tdb2/_info | 1 + ccan/tdb2/private.h | 18 +----------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/ccan/tdb2/_info b/ccan/tdb2/_info index a6d4ec7d..884916ab 100644 --- 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/endian\n"); return 0; } diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h index 7b79cc3e..1650cf83 100644 --- a/ccan/tdb2/private.h +++ b/ccan/tdb2/private.h @@ -38,9 +38,7 @@ #include #include #include -#if HAVE_BYTESWAP_H -#include -#endif +#include #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) -#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) -- 2.39.2