summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/build/pidl/Parse/Pidl/ODL.pm1
-rw-r--r--source4/build/pidl/Parse/Pidl/Samba/NDR/Header.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/source4/build/pidl/Parse/Pidl/ODL.pm b/source4/build/pidl/Parse/Pidl/ODL.pm
index 9bf94b78b4..03d66bfc45 100644
--- a/source4/build/pidl/Parse/Pidl/ODL.pm
+++ b/source4/build/pidl/Parse/Pidl/ODL.pm
@@ -81,6 +81,7 @@ sub ODL2IDL($)
foreach my $fn (reverse @{$base->{DATA}}) {
next unless ($fn->{TYPE} eq "FUNCTION");
unshift (@{$x->{DATA}}, $fn);
+ push (@{$x->{INHERITED_FUNCTIONS}}, $fn->{NAME});
}
}
}
diff --git a/source4/build/pidl/Parse/Pidl/Samba/NDR/Header.pm b/source4/build/pidl/Parse/Pidl/Samba/NDR/Header.pm
index 7959ef1e22..a460d1c588 100644
--- a/source4/build/pidl/Parse/Pidl/Samba/NDR/Header.pm
+++ b/source4/build/pidl/Parse/Pidl/Samba/NDR/Header.pm
@@ -387,6 +387,7 @@ sub HeaderInterface($)
foreach my $d (@{$interface->{DATA}}) {
next if $d->{TYPE} ne "FUNCTION";
next if has_property($d, "noopnum");
+ next if grep(/$d->{NAME}/,@{$interface->{INHERITED_FUNCTIONS}});
my $u_name = uc $d->{NAME};
pidl "#define DCERPC_$u_name (";