diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-11-02 13:48:11 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:44:07 +0100 |
| commit | ecbc2cdd7a2b742515046fa0cdbccec0f4be9a2a (patch) | |
| tree | cc0356ad5eb27fc567af2777e7796bb4c975735c | |
| parent | b42cc4afd32c524aee18f46d0a779835b98b9457 (diff) | |
| download | samba-ecbc2cdd7a2b742515046fa0cdbccec0f4be9a2a.tar.gz samba-ecbc2cdd7a2b742515046fa0cdbccec0f4be9a2a.tar.bz2 samba-ecbc2cdd7a2b742515046fa0cdbccec0f4be9a2a.zip | |
r25806: let libndr.h include needed stuff and remove pidl magic
for choosing common required headers
metze
(This used to be commit c97fe5b54c0da68c7e71ea79678fa6348ecdaab9)
| -rw-r--r-- | source4/librpc/ndr/libndr.h | 4 | ||||
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 6 |
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")); - } } ##################################################################### |