summaryrefslogtreecommitdiff
path: root/source4/build/pidl
diff options
context:
space:
mode:
Diffstat (limited to 'source4/build/pidl')
-rw-r--r--source4/build/pidl/header.pm17
-rw-r--r--source4/build/pidl/idl.pm2
-rw-r--r--source4/build/pidl/idl.yp2
3 files changed, 14 insertions, 7 deletions
diff --git a/source4/build/pidl/header.pm b/source4/build/pidl/header.pm
index cc9b804387..b981200781 100644
--- a/source4/build/pidl/header.pm
+++ b/source4/build/pidl/header.pm
@@ -350,16 +350,27 @@ sub HeaderInterface($)
$res .= "NTSTATUS dcerpc_server_$interface->{NAME}_init(void);\n\n";
}
- $count = $interface->{INHERITED_FUNCTIONS};
foreach my $d (@{$data}) {
if ($d->{TYPE} eq "FUNCTION") {
my $u_name = uc $d->{NAME};
- $res .= "#define DCERPC_$u_name " . sprintf("0x%02x", $count) . "\n";
+ $res .= "#define DCERPC_$u_name (";
+
+ if (defined($interface->{BASE})) {
+ $res .= "DCERPC_" . uc $interface->{BASE} . "_CALL_COUNT + ";
+ }
+
+ $res .= sprintf("0x%02x", $count) . ")\n";
$count++;
}
}
- $res .= "\n\n";
+ $res .= "\n#define DCERPC_" . uc $interface->{NAME} . "_CALL_COUNT (";
+
+ if (defined($interface->{BASE})) {
+ $res .= "DCERPC_" . uc $interface->{BASE} . "_CALL_COUNT + ";
+ }
+
+ $res .= "$count)\n\n";
foreach my $d (@{$data}) {
($d->{TYPE} eq "CONST") &&
diff --git a/source4/build/pidl/idl.pm b/source4/build/pidl/idl.pm
index a3e2e2ca8c..19525e42f3 100644
--- a/source4/build/pidl/idl.pm
+++ b/source4/build/pidl/idl.pm
@@ -2080,10 +2080,8 @@ sub parse_idl($$)
die("No such parent interface " . $x->{BASE});
}
- $x->{INHERITED_FUNCTIONS} = scalar @{$parent->{INHERITED_DATA}};
@{$x->{INHERITED_DATA}} = (@{$parent->{INHERITED_DATA}}, @{$x->{DATA}});
} else {
- $x->{INHERITED_FUNCTIONS} = 0;
$x->{INHERITED_DATA} = $x->{DATA};
}
}
diff --git a/source4/build/pidl/idl.yp b/source4/build/pidl/idl.yp
index e571645c4b..24f88dd531 100644
--- a/source4/build/pidl/idl.yp
+++ b/source4/build/pidl/idl.yp
@@ -368,10 +368,8 @@ sub parse_idl($$)
die("No such parent interface " . $x->{BASE});
}
- $x->{INHERITED_FUNCTIONS} = scalar @{$parent->{INHERITED_DATA}};
@{$x->{INHERITED_DATA}} = (@{$parent->{INHERITED_DATA}}, @{$x->{DATA}});
} else {
- $x->{INHERITED_FUNCTIONS} = 0;
$x->{INHERITED_DATA} = $x->{DATA};
}
}