Author: metze Date: 2007-11-02 13:48:11 +0000 (Fri, 02 Nov 2007) New Revision: 25806
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25806 Log: let libndr.h include needed stuff and remove pidl magic for choosing common required headers metze Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm Changeset: Modified: branches/SAMBA_4_0/source/librpc/ndr/libndr.h =================================================================== --- branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2007-11-02 13:05:43 UTC (rev 25805) +++ branches/SAMBA_4_0/source/librpc/ndr/libndr.h 2007-11-02 13:48:11 UTC (rev 25806) @@ -286,8 +286,8 @@ 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; Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm =================================================================== --- branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm 2007-11-02 13:05:43 UTC (rev 25805) +++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm 2007-11-02 13:48:11 UTC (rev 25806) @@ -2607,12 +2607,6 @@ $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")); - } } #####################################################################
