summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-18 18:41:23 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-18 18:41:23 +0200
commit75b59c9b31d1a69ab58770d8741e15a894a1cad3 (patch)
tree13a43fb86f2dce06016bbf256e993448dc677f05 /source4
parente9429a2abe06c20e5e4582febe8e6c0a20756e48 (diff)
parent5b827dfd8b20e4c268a594e733765bef147020fb (diff)
downloadsamba-75b59c9b31d1a69ab58770d8741e15a894a1cad3.tar.gz
samba-75b59c9b31d1a69ab58770d8741e15a894a1cad3.tar.bz2
samba-75b59c9b31d1a69ab58770d8741e15a894a1cad3.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4')
-rw-r--r--source4/lib/com/main.c3
-rw-r--r--source4/lib/com/tables.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/source4/lib/com/main.c b/source4/lib/com/main.c
index 3e4127f246..882b479cfe 100644
--- a/source4/lib/com/main.c
+++ b/source4/lib/com/main.c
@@ -19,11 +19,10 @@
*/
#include "includes.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
#include "lib/com/com.h"
#include "lib/events/events.h"
#include "librpc/gen_ndr/com_dcom.h"
-#include "build.h"
WERROR com_init_ctx(struct com_context **ctx, struct event_context *event_ctx)
{
diff --git a/source4/lib/com/tables.c b/source4/lib/com/tables.c
index d9989ecdbe..11bf95c4d6 100644
--- a/source4/lib/com/tables.c
+++ b/source4/lib/com/tables.c
@@ -19,7 +19,7 @@
*/
#include "includes.h"
-#include "dlinklist.h"
+#include "lib/util/dlinklist.h"
#include "lib/com/com.h"
#include "librpc/gen_ndr/ndr_misc.h"