summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-16 14:36:41 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-16 14:36:41 +0200
commit80a5da73e9a9ed148314be3fa071181c82fc7c64 (patch)
treec561200c7b7ff8e9bf6e44be0ad9f093789a3b72 /source3/include
parentec1c854f2175823bd1ad39c2e272d1b3fab80bf1 (diff)
downloadsamba-80a5da73e9a9ed148314be3fa071181c82fc7c64.tar.gz
samba-80a5da73e9a9ed148314be3fa071181c82fc7c64.tar.bz2
samba-80a5da73e9a9ed148314be3fa071181c82fc7c64.zip
Share talloc source code between Samba 3 and Samba 4.
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/talloc_stack.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 9c5ea08f6d..0691a76235 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -652,7 +652,7 @@ typedef char fstring[FSTRING_LEN];
#include "tdb.h"
#include "util_tdb.h"
-#include "lib/talloc/talloc.h"
+#include "../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)
diff --git a/source3/include/talloc_stack.h b/source3/include/talloc_stack.h
index a2a12f8a63..bb22b8a029 100644
--- a/source3/include/talloc_stack.h
+++ b/source3/include/talloc_stack.h
@@ -35,7 +35,7 @@
#ifndef _TALLOC_STACK_H
#define _TALLOC_STACK_H
-#include "lib/talloc/talloc.h"
+#include "../talloc/talloc.h"
/*
* Create a new talloc stack frame.