diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 18:41:23 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 18:41:23 +0200 |
| commit | 75b59c9b31d1a69ab58770d8741e15a894a1cad3 (patch) | |
| tree | 13a43fb86f2dce06016bbf256e993448dc677f05 | |
| parent | e9429a2abe06c20e5e4582febe8e6c0a20756e48 (diff) | |
| parent | 5b827dfd8b20e4c268a594e733765bef147020fb (diff) | |
| download | samba-75b59c9b31d1a69ab58770d8741e15a894a1cad3.tar.gz samba-75b59c9b31d1a69ab58770d8741e15a894a1cad3.tar.bz2 samba-75b59c9b31d1a69ab58770d8741e15a894a1cad3.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
| -rw-r--r-- | source4/lib/com/main.c | 3 | ||||
| -rw-r--r-- | source4/lib/com/tables.c | 2 |
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" |