summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-06-20 18:40:33 +0930
committerRusty Russell <rusty@rustcorp.com.au>2011-06-20 11:18:35 +0200
commit6b3f9ac0f878199ba0ab6855a65fda369e95ae27 (patch)
tree40e9b1bca70a50cf05ebe61231089280d1b6c5a7
parentd24ddb0350ddb402bd9d219e129439cdbd77ecfe (diff)
downloadsamba-6b3f9ac0f878199ba0ab6855a65fda369e95ae27.tar.gz
samba-6b3f9ac0f878199ba0ab6855a65fda369e95ae27.tar.bz2
samba-6b3f9ac0f878199ba0ab6855a65fda369e95ae27.zip
tdb2: minor changes to SAMBIFY it.
This is a bit messy, but it works. Kept as a separate patch so it's easier to merge back and forth with CCAN's tdb2. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r--lib/tdb2/private.h18
-rw-r--r--lib/tdb2/tdb.c2
-rw-r--r--lib/tdb2/tdb2.h2
3 files changed, 18 insertions, 4 deletions
diff --git a/lib/tdb2/private.h b/lib/tdb2/private.h
index 135e3df936..0c3e441657 100644
--- a/lib/tdb2/private.h
+++ b/lib/tdb2/private.h
@@ -22,6 +22,19 @@
#if HAVE_FILE_OFFSET_BITS
#define _FILE_OFFSET_BITS 64
#endif
+#include <ccan/likely/likely.h>
+#include <ccan/compiler/compiler.h>
+#include <ccan/endian/endian.h>
+#include "tdb2.h"
+
+#ifdef _SAMBA_BUILD_
+#include "replace.h"
+#include "system/filesys.h"
+#include "system/time.h"
+#include "system/shmem.h"
+#include "system/select.h"
+#include "system/wait.h"
+#else
#include <stdint.h>
#include <stdbool.h>
#include <stdlib.h>
@@ -35,10 +48,7 @@
#include <stdio.h>
#include <utime.h>
#include <unistd.h>
-#include <ccan/tdb2/tdb2.h>
-#include <ccan/likely/likely.h>
-#include <ccan/compiler/compiler.h>
-#include <ccan/endian/endian.h>
+#endif
#ifndef TEST_IT
#define TEST_IT(cond)
diff --git a/lib/tdb2/tdb.c b/lib/tdb2/tdb.c
index b8b5aac128..753ccb0c8b 100644
--- a/lib/tdb2/tdb.c
+++ b/lib/tdb2/tdb.c
@@ -1,6 +1,8 @@
#include "private.h"
+#ifndef _SAMBA_BUILD_
#include <ccan/asprintf/asprintf.h>
#include <stdarg.h>
+#endif
static enum TDB_ERROR update_rec_hdr(struct tdb_context *tdb,
tdb_off_t off,
diff --git a/lib/tdb2/tdb2.h b/lib/tdb2/tdb2.h
index c6e09e9f16..3f80793d76 100644
--- a/lib/tdb2/tdb2.h
+++ b/lib/tdb2/tdb2.h
@@ -42,6 +42,8 @@ extern "C" {
#include <stdbool.h>
/* For memcmp */
#include <string.h>
+#else
+#include "replace.h"
#endif
#include <ccan/compiler/compiler.h>
#include <ccan/typesafe_cb/typesafe_cb.h>