Author: metze Date: 2007-11-02 13:02:25 +0000 (Fri, 02 Nov 2007) New Revision: 25804
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25804 Log: move including ndr_compression.h into HeaderInterface() metze Modified: branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm Changeset: 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 12:54:19 UTC (rev 25803) +++ branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm 2007-11-02 13:02:25 UTC (rev 25804) @@ -2392,14 +2392,18 @@ # generate prototypes and defines for the interface definitions # FIXME: these prototypes are for the DCE/RPC client functions, not the # NDR parser and so do not belong here, technically speaking -sub HeaderInterface($$) +sub HeaderInterface($$$) { - my($self,$interface) = @_; + my($self,$interface,$needed) = @_; my $count = 0; $self->pidl_hdr(choose_header("librpc/ndr/libndr.h", "ndr.h")); + if ($needed->{"compression"}) { + $self->pidl(choose_header("librpc/ndr/ndr_compression.h", "ndr/compression.h")); + } + if (has_property($interface, "object")) { $self->pidl(choose_header("librpc/gen_ndr/ndr_orpc.h", "ndr/orpc.h")); } @@ -2559,12 +2563,8 @@ $self->pidl_hdr(""); - if ($needed->{"compression"}) { - $self->pidl(choose_header("librpc/ndr/ndr_compression.h", "ndr/compression.h")); - } + $self->HeaderInterface($interface, $needed); - $self->HeaderInterface($interface); - # Typedefs foreach my $d (@{$interface->{TYPES}}) { ($needed->{TypeFunctionName("ndr_push", $d)}) && $self->ParseTypePushFunction($d, "r");
