tdb2: make tdb1 headers include tdb2 headers.

[ccan] / ccan / tdb2 / tdb1_private.h

diff --git a/ccan/tdb2/tdb1_private.h b/ccan/tdb2/tdb1_private.h
index b34d4dd1ba194490871ed21c3ce87d9625b1b682..7ce192b9a6d0cbd30fda6ee5e2688dfd0d5725b1 100644 (file)
--- a/ccan/tdb2/tdb1_private.h
+++ b/ccan/tdb2/tdb1_private.h
@@ -25,42 +25,11 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _SAMBA_BUILD_
-#include "config.h"
-/* This keeps us consistent with TDB2 code. */
-#if HAVE_FILE_OFFSET_BITS
-#define _FILE_OFFSET_BITS 64
-#endif
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <sys/time.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <stdio.h>
-#include <utime.h>
-
-#ifndef _PUBLIC_
-#define _PUBLIC_
-#endif
-
-#else
-#include "replace.h"
-#include "system/filesys.h"
-#include "system/time.h"
-#include "system/shmem.h"
-#include "system/select.h"
-#include "system/wait.h"
-#endif
-
+#include "private.h"
 #include "tdb1.h"
 
+#include <limits.h>
+
 /* Temporary wrapper to avoid undue churn in test/ */
 #define tdb1_error(tdb) ((tdb)->ecode)
 
@@ -185,8 +154,6 @@ enum tdb1_lock_flags {
        TDB1_LOCK_WAIT = 1,
        /* If set, don't log an error on failure. */
        TDB1_LOCK_PROBE = 2,
-       /* If set, don't actually lock at all. */
-       TDB1_LOCK_MARK_ONLY = 4,
 };
 
 struct tdb1_context;
@@ -234,8 +201,7 @@ void tdb1_mmap(struct tdb1_context *tdb);
 int tdb1_lock(struct tdb1_context *tdb, int list, int ltype);
 int tdb1_nest_lock(struct tdb1_context *tdb, uint32_t offset, int ltype,
                  enum tdb1_lock_flags flags);
-int tdb1_nest_unlock(struct tdb1_context *tdb, uint32_t offset, int ltype,
-                   bool mark_lock);
+int tdb1_nest_unlock(struct tdb1_context *tdb, uint32_t offset, int ltype);
 int tdb1_unlock(struct tdb1_context *tdb, int list, int ltype);
 int tdb1_brlock(struct tdb1_context *tdb,
               int rw_type, tdb1_off_t offset, size_t len,
@@ -253,7 +219,7 @@ int tdb1_recovery_area(struct tdb1_context *tdb,
                      struct tdb1_record *rec);
 int tdb1_allrecord_lock(struct tdb1_context *tdb, int ltype,
                       enum tdb1_lock_flags flags, bool upgradable);
-int tdb1_allrecord_unlock(struct tdb1_context *tdb, int ltype, bool mark_lock);
+int tdb1_allrecord_unlock(struct tdb1_context *tdb, int ltype);
 int tdb1_allrecord_upgrade(struct tdb1_context *tdb);
 int tdb1_write_lock_record(struct tdb1_context *tdb, tdb1_off_t off);
 int tdb1_write_unlock_record(struct tdb1_context *tdb, tdb1_off_t off);