summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-04-14 11:43:31 +0200
committerGünther Deschner <gd@samba.org>2011-04-14 12:56:27 +0200
commit7ece43b15e11ccff6181266d53c88c14271167c2 (patch)
treed0900871966428bbc621311770fd7892091952e6
parentdaea6a4b8cf48c96718d6f757d01c430d1811446 (diff)
downloadsamba-7ece43b15e11ccff6181266d53c88c14271167c2.tar.gz
samba-7ece43b15e11ccff6181266d53c88c14271167c2.tar.bz2
samba-7ece43b15e11ccff6181266d53c88c14271167c2.zip
s3-build: make sure we pick up system tdb and talloc via #include.
Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Thu Apr 14 12:56:28 CEST 2011 on sn-devel-104
-rw-r--r--source3/configure.in2
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/include/util_tdb.h4
-rw-r--r--source3/lib/tdb_validate.h2
4 files changed, 6 insertions, 6 deletions
diff --git a/source3/configure.in b/source3/configure.in
index f0d54ccc3d..086e0442a0 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2151,7 +2151,7 @@ then
AC_SUBST(TDBTORTURE)
ac_cv_have_tdb_err_nesting=yes
else
- AC_TRY_COMPILE([#include "tdb.h"],
+ AC_TRY_COMPILE([#include <tdb.h>],
[enum TDB_ERROR err = TDB_ERR_NESTING],
ac_cv_have_tdb_err_nesting=yes,
ac_cv_have_tdb_err_nesting=no)
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 452464b1ce..1dac73a168 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -515,10 +515,10 @@ typedef char fstring[FSTRING_LEN];
#include "../lib/util/attr.h"
#include "../lib/util/tsort.h"
#include "../lib/util/dlinklist.h"
-#include "tdb.h"
+#include <tdb.h>
#include "util_tdb.h"
-#include "talloc.h"
+#include <talloc.h>
#include "event.h"
#include "../lib/util/tevent_unix.h"
diff --git a/source3/include/util_tdb.h b/source3/include/util_tdb.h
index 9666fc979a..3bdb6977d8 100644
--- a/source3/include/util_tdb.h
+++ b/source3/include/util_tdb.h
@@ -20,9 +20,9 @@
#ifndef __TDBUTIL_H__
#define __TDBUTIL_H__
-#include "tdb.h"
+#include <tdb.h>
-#include "talloc.h" /* for tdb_wrap_open() */
+#include <talloc.h> /* for tdb_wrap_open() */
#include "../libcli/util/ntstatus.h" /* for map_nt_error_from_tdb() */
#include "../../lib/util/util_tdb.h"
diff --git a/source3/lib/tdb_validate.h b/source3/lib/tdb_validate.h
index 9eda79d7db..3e7c20d04c 100644
--- a/source3/lib/tdb_validate.h
+++ b/source3/lib/tdb_validate.h
@@ -23,7 +23,7 @@
#define __TDB_VALIDATE_H__
#include "lib/replace/replace.h"
-#include "tdb.h"
+#include <tdb.h>
/**
* Flag field for keeping track of the status of a validation.