diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-11-02 13:02:25 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:44:06 +0100 |
| commit | 5dc1f49d5fa78ccf042584c1add9d6094fcaa0b4 (patch) | |
| tree | 7b183056a4f565dd73d401e0ca175b4acb3c91d9 | |
| parent | f2002541ced97da3658348fe9ac9e212dd50c55b (diff) | |
| download | samba-5dc1f49d5fa78ccf042584c1add9d6094fcaa0b4.tar.gz samba-5dc1f49d5fa78ccf042584c1add9d6094fcaa0b4.tar.bz2 samba-5dc1f49d5fa78ccf042584c1add9d6094fcaa0b4.zip | |
r25804: move including ndr_compression.h into HeaderInterface()
metze
(This used to be commit 2aecc1e9fd19d4e176f5475c8ee0b292d68c85f9)
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 002e49c8b1..7941b65141 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -2392,14 +2392,18 @@ sub HeaderInclude # 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,11 +2563,7 @@ sub ParseInterface($$$) $self->pidl_hdr(""); - if ($needed->{"compression"}) { - $self->pidl(choose_header("librpc/ndr/ndr_compression.h", "ndr/compression.h")); - } - - $self->HeaderInterface($interface); + $self->HeaderInterface($interface, $needed); # Typedefs foreach my $d (@{$interface->{TYPES}}) { |