summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-02-27 18:45:53 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-02-28 21:11:21 +0100
commit136c1600648f690d7709a204c4a7117bb5a868c3 (patch)
tree0196bb5951597728e3524935dc92033d89afa71f /source4
parent4a42272f09aa52db8b1e11595b266d0ef8d4b041 (diff)
downloadsamba-136c1600648f690d7709a204c4a7117bb5a868c3.tar.gz
samba-136c1600648f690d7709a204c4a7117bb5a868c3.tar.bz2
samba-136c1600648f690d7709a204c4a7117bb5a868c3.zip
Use <tdb.h> to include tdb, so the system include file gets used when building against
system tdb.
Diffstat (limited to 'source4')
-rw-r--r--source4/cluster/local.c2
-rw-r--r--source4/lib/ldb-samba/ldb_wrap.c2
-rw-r--r--source4/lib/messaging/messaging.c2
-rw-r--r--source4/lib/tdb_wrap.c2
-rw-r--r--source4/lib/tdb_wrap.h2
-rw-r--r--source4/ntvfs/common/brlock.c2
-rw-r--r--source4/ntvfs/common/brlock_tdb.c2
-rw-r--r--source4/ntvfs/common/notify.c2
-rw-r--r--source4/ntvfs/common/opendb_tdb.c2
-rw-r--r--source4/ntvfs/posix/vfs_posix.c2
-rw-r--r--source4/ntvfs/posix/xattr_tdb.c2
-rw-r--r--source4/torture/basic/mangle_test.c2
-rw-r--r--source4/torture/local/dbspeed.c2
13 files changed, 13 insertions, 13 deletions
diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index 2d910d1e28..a93b0a65ed 100644
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -22,7 +22,7 @@
#include "includes.h"
#include "cluster/cluster.h"
#include "cluster/cluster_private.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "tdb_wrap.h"
#include "system/filesys.h"
#include "param/param.h"
diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c
index e3e6dcecfa..7dcf514e23 100644
--- a/source4/lib/ldb-samba/ldb_wrap.c
+++ b/source4/lib/ldb-samba/ldb_wrap.c
@@ -35,7 +35,7 @@
#include "dsdb/samdb/samdb.h"
#include "param/param.h"
#include "../lib/util/dlinklist.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
/*
this is used to catch debug messages from ldb
diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index c61bb7afca..f9d63203f2 100644
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -30,7 +30,7 @@
#include "tdb_wrap.h"
#include "../lib/util/unix_privs.h"
#include "librpc/rpc/dcerpc.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "../lib/util/util_tdb.h"
#include "cluster/cluster.h"
#include "../lib/util/tevent_ntstatus.h"
diff --git a/source4/lib/tdb_wrap.c b/source4/lib/tdb_wrap.c
index da27803b06..e08e4f73fc 100644
--- a/source4/lib/tdb_wrap.c
+++ b/source4/lib/tdb_wrap.c
@@ -20,7 +20,7 @@
*/
#include "includes.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "../lib/util/dlinklist.h"
#include "tdb_wrap.h"
#include "tdb.h"
diff --git a/source4/lib/tdb_wrap.h b/source4/lib/tdb_wrap.h
index d49fafbf0c..94035c1bea 100644
--- a/source4/lib/tdb_wrap.h
+++ b/source4/lib/tdb_wrap.h
@@ -29,7 +29,7 @@
#ifndef _TDB_WRAP_H_
#define _TDB_WRAP_H_
-#include "../lib/tdb/include/tdb.h"
+#include <tdb.h>
struct tdb_wrap {
struct tdb_context *tdb;
diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index 154494e4af..94041d2014 100644
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -26,7 +26,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "messaging/messaging.h"
#include "lib/messaging/irpc.h"
#include "libcli/libcli.h"
diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c
index 07e7c1aa5c..35d4c27d0f 100644
--- a/source4/ntvfs/common/brlock_tdb.c
+++ b/source4/ntvfs/common/brlock_tdb.c
@@ -26,7 +26,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "messaging/messaging.h"
#include "tdb_wrap.h"
#include "lib/messaging/irpc.h"
diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index e369404e85..0b5f91bfe1 100644
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -25,7 +25,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "../lib/util/util_tdb.h"
#include "messaging/messaging.h"
#include "tdb_wrap.h"
diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c
index 944ec86631..881fd5b57a 100644
--- a/source4/ntvfs/common/opendb_tdb.c
+++ b/source4/ntvfs/common/opendb_tdb.c
@@ -40,7 +40,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "messaging/messaging.h"
#include "tdb_wrap.h"
#include "lib/messaging/irpc.h"
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 1e0efcddc8..ca1d163327 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -26,7 +26,7 @@
#include "includes.h"
#include "vfs_posix.h"
#include "librpc/gen_ndr/security.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "tdb_wrap.h"
#include "libcli/security/security.h"
#include "lib/events/events.h"
diff --git a/source4/ntvfs/posix/xattr_tdb.c b/source4/ntvfs/posix/xattr_tdb.c
index 69324a3498..de7c83677a 100644
--- a/source4/ntvfs/posix/xattr_tdb.c
+++ b/source4/ntvfs/posix/xattr_tdb.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "tdb_wrap.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "vfs_posix.h"
#define XATTR_LIST_ATTR ".xattr_list"
diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index 0f38c9ff03..1305634460 100644
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -20,7 +20,7 @@
#include "includes.h"
#include "system/filesys.h"
#include "system/dir.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include "../lib/util/util_tdb.h"
#include "libcli/libcli.h"
#include "torture/util.h"
diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 9d7c551db6..8768b349ef 100644
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -21,7 +21,7 @@
#include "includes.h"
#include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
#include <ldb.h>
#include <ldb_errors.h>
#include "ldb_wrap.h"