summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2009-10-09 13:14:08 -0400
committerSimo Sorce <idra@samba.org>2009-10-09 13:14:08 -0400
commit99cdbe35717dcd7b8adabae2b8b366dd87357807 (patch)
tree6aa950e7c96e9870681ee7a793a919efd1cd23a4 /source3/include
parent8283affee6fb0bb0347aa6fcd3033a61eaf6c27d (diff)
downloadsamba-99cdbe35717dcd7b8adabae2b8b366dd87357807.tar.gz
samba-99cdbe35717dcd7b8adabae2b8b366dd87357807.tar.bz2
samba-99cdbe35717dcd7b8adabae2b8b366dd87357807.zip
Fix builds with external talloc
Make sure we do not reference our internal talloc directly. Let configure define what talloc.h file to use so that builds that use an extrenal talloc do not include 2 different versions of the talloc header.
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 453c8b3f29..b3446cbf65 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -621,7 +621,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
#include "tdb.h"
#include "util_tdb.h"
-#include "../talloc/talloc.h"
+#include "talloc.h"
#include "event.h"
#include "../lib/util/tevent_unix.h"