X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=1650cf833d7988599e1d73e55181ed9317bbb1c6;hp=369511cd5d2f86eb11748df04d932bf8fb85d461;hb=74257cee33ae3033f961d5f22a0313b8cb1b18d4;hpb=a94286219597d8123188aaff0aaa55dba5104a05

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 369511cd..1650cf83 100644
--- 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>
-#if HAVE_BYTESWAP_H
-#include <byteswap.h>
-#endif
+#include <ccan/endian/endian.h>
 
 #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)
@@ -570,8 +554,8 @@ enum TDB_ERROR tdb_allrecord_upgrade(struct tdb_context *tdb);
 
 /* Serialize db open. */
 enum TDB_ERROR tdb_lock_open(struct tdb_context *tdb,
-			     enum tdb_lock_flags flags);
-void tdb_unlock_open(struct tdb_context *tdb);
+			     int ltype, enum tdb_lock_flags flags);
+void tdb_unlock_open(struct tdb_context *tdb, int ltype);
 bool tdb_has_open_lock(struct tdb_context *tdb);
 
 /* Serialize db expand. */