summaryrefslogtreecommitdiff
path: root/source3/include/includes.h
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-22 04:16:58 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:01:02 -0500
commit21931b1ca834f41c5ca931cdfb6f0347b5cb3c96 (patch)
tree0e93b2474ef97d0f68e2da0d73bd1fc3ad924926 /source3/include/includes.h
parent200d2383020c105447b214b40ecd50821d654388 (diff)
downloadsamba-21931b1ca834f41c5ca931cdfb6f0347b5cb3c96.tar.gz
samba-21931b1ca834f41c5ca931cdfb6f0347b5cb3c96.tar.bz2
samba-21931b1ca834f41c5ca931cdfb6f0347b5cb3c96.zip
r18810: use a copy of samba4's talloc under lib/talloc/
to make mergeing easier. metze (This used to be commit d49ffbc19b29f7620e427de133ffab74721f37e8)
Diffstat (limited to 'source3/include/includes.h')
-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 16056a56a1..ede93e5865 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -638,7 +638,7 @@ typedef int BOOL;
#include "tdbutil.h"
#include "tdbback.h"
-#include "talloc.h"
+#include "lib/talloc/talloc.h"
/* And a little extension. Abort on type mismatch */
#define talloc_get_type_abort(ptr, type) \
(type *)talloc_check_name_abort(ptr, #type)