diff options
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/pidl/client.pm | 4 | ||||
| -rw-r--r-- | source4/build/pidl/parser.pm | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source4/build/pidl/client.pm b/source4/build/pidl/client.pm index d9d2a0ca14..9502c68e1a 100644 --- a/source4/build/pidl/client.pm +++ b/source4/build/pidl/client.pm @@ -69,6 +69,7 @@ NTSTATUS dcerpc_$name(struct dcom_interface *d, TALLOC_CTX *mem_ctx, struct $nam } "; + $objarg = "d"; } else { $res .= " @@ -77,10 +78,11 @@ NTSTATUS dcerpc_$name(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct $name * struct rpc_request *req; NTSTATUS status; "; + $objarg = "p"; } $res .= " - req = dcerpc_$name\_send(p, mem_ctx, r); + req = dcerpc_$name\_send($objarg, mem_ctx, r); if (req == NULL) return NT_STATUS_NO_MEMORY; status = dcerpc_ndr_request_recv(req); diff --git a/source4/build/pidl/parser.pm b/source4/build/pidl/parser.pm index 39ec8a89a0..2ace0fdd8f 100644 --- a/source4/build/pidl/parser.pm +++ b/source4/build/pidl/parser.pm @@ -162,10 +162,7 @@ sub struct_alignment for my $e (@{$s->{ELEMENTS}}) { my $a = 1; - if (util::has_property($e, "align")) - { - $a = $e->{PROPERTIES}->{align}; - } elsif (!util::need_wire_pointer($e) + if (!util::need_wire_pointer($e) && defined $structs{$e->{TYPE}}) { if ($structs{$e->{TYPE}}->{DATA}->{TYPE} eq "STRUCT") { $a = struct_alignment($structs{$e->{TYPE}}->{DATA}); |