summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/librpc/ndr/libndr.h4
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm6
2 files changed, 2 insertions, 8 deletions
diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index 84a2bd52e3..2e7598c807 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -286,8 +286,8 @@ typedef NTSTATUS (*ndr_pull_flags_fn_t)(struct ndr_pull *, int ndr_flags, void *
typedef void (*ndr_print_fn_t)(struct ndr_print *, const char *, const void *);
typedef void (*ndr_print_function_t)(struct ndr_print *, const char *, int, const void *);
-#include "librpc/gen_ndr/misc.h"
-#include "libcli/util/werror.h"
+#include "libcli/util/error.h"
+#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/ndr/libndr_proto.h"
extern const struct ndr_syntax_id ndr_transfer_syntax;
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 69e5b0d5a1..3ad9231740 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2607,12 +2607,6 @@ sub GenerateIncludes($)
$self->pidl("#include <stdarg.h>");
$self->pidl("#include <string.h>");
}
-
- # Samba3 has everything in include/includes.h
- if (is_intree() != 3) {
- $self->pidl(choose_header("libcli/util/ntstatus.h", "core/ntstatus.h"));
- $self->pidl(choose_header("librpc/gen_ndr/ndr_misc.h", "gen_ndr/ndr_misc.h"));
- }
}
#####################################################################