summaryrefslogtreecommitdiff
path: root/source4/pidl/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-03-16 00:23:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:57:27 -0500
commit8528016978b084213ef53d66e1b6e831b1a01acc (patch)
tree860fdc4f5a795de773104e8c4b93816495107879 /source4/pidl/lib
parent753bf8fb995d5cd9abe4c23b5dc79e2392dfa1cb (diff)
downloadsamba-8528016978b084213ef53d66e1b6e831b1a01acc.tar.gz
samba-8528016978b084213ef53d66e1b6e831b1a01acc.tar.bz2
samba-8528016978b084213ef53d66e1b6e831b1a01acc.zip
r14464: Don't include ndr_BASENAME.h files unless strictly required, instead
try to include just the BASENAME.h files (containing only structs) (This used to be commit 3dd477ca5147f28a962b8437e2611a8222d706bd)
Diffstat (limited to 'source4/pidl/lib')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm6
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm4
2 files changed, 7 insertions, 3 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
index 42375674f5..972368195b 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm
@@ -2239,10 +2239,14 @@ sub HeaderInterface($)
pidl_hdr "#include \"librpc/ndr/libndr.h\"";
+ if (has_property($interface, "object")) {
+ pidl "#include \"librpc/gen_ndr/ndr_orpc.h\"";
+ }
+
if (defined $interface->{PROPERTIES}->{depends}) {
my @d = split / /, $interface->{PROPERTIES}->{depends};
foreach my $i (@d) {
- pidl_hdr "#include \"librpc/gen_ndr/ndr_$i\.h\"";
+ pidl "#include \"librpc/gen_ndr/ndr_$i\.h\"";
}
}
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
index 8710f08cc7..fd6d303330 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Server.pm
@@ -309,11 +309,11 @@ sub ParseInterface($)
sub Parse($$)
{
- my($ndr) = shift;
- my($filename) = shift;
+ my($ndr,$header) = @_;
$res = "";
$res .= "/* server functions auto-generated by pidl */\n";
+ $res .= "#include \"$header\"\n";
$res .= "\n";
foreach my $x (@{$ndr}) {