diff options
| author | Simo Sorce <idra@samba.org> | 2009-10-11 09:42:59 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2009-10-11 09:48:53 -0400 |
| commit | 7bce1ab5e88dd4cf5599ad3a986fbbf8fc61f9d5 (patch) | |
| tree | 4d20efedc1240a5782799d1746386e004a807b0e | |
| parent | 815b790c96c72cb995c983bbbc3cc95801aaacaa (diff) | |
| download | samba-7bce1ab5e88dd4cf5599ad3a986fbbf8fc61f9d5.tar.gz samba-7bce1ab5e88dd4cf5599ad3a986fbbf8fc61f9d5.tar.bz2 samba-7bce1ab5e88dd4cf5599ad3a986fbbf8fc61f9d5.zip | |
Fix builds with external tdb
Make sure we do not reference our internal tdb directly.
Let configure define what tdb.h file to use so that builds that use an
extrenal tdb do not include 2 different versions of the tdb header.
| -rw-r--r-- | lib/util/util_tdb.c | 2 | ||||
| -rw-r--r-- | source3/lib/ldb/ldb_tdb/ldb_tdb.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c index e107cbdc4a..cda8dc75b2 100644 --- a/lib/util/util_tdb.c +++ b/lib/util/util_tdb.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "../tdb/include/tdb.h" +#include "tdb.h" #include "../lib/util/util_tdb.h" /* these are little tdb utility functions that are meant to make diff --git a/source3/lib/ldb/ldb_tdb/ldb_tdb.h b/source3/lib/ldb/ldb_tdb/ldb_tdb.h index 486d948fa0..caf8ba8d0c 100644 --- a/source3/lib/ldb/ldb_tdb/ldb_tdb.h +++ b/source3/lib/ldb/ldb_tdb/ldb_tdb.h @@ -3,13 +3,7 @@ #include "system/filesys.h" #endif -#if (_SAMBA_BUILD_ >= 4) -#include "lib/tdb/include/tdb.h" -#elif defined(_SAMBA_BUILD_) -#include "../tdb/include/tdb.h" -#else #include "tdb.h" -#endif /* this private structure is used by the ltdb backend in the ldb_context */ |