diff options
| author | Tim Potter <tpot@samba.org> | 2005-08-02 18:29:51 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:30:58 -0500 |
| commit | f91008deb7d88d6c8af473361dcc10644c330096 (patch) | |
| tree | 9ddc162bc482ffbf3e2b6a1ca7109070ac742e88 | |
| parent | 2a45ec2049479a81298c991d6c6d86eef0118292 (diff) | |
| download | samba-f91008deb7d88d6c8af473361dcc10644c330096.tar.gz samba-f91008deb7d88d6c8af473361dcc10644c330096.tar.bz2 samba-f91008deb7d88d6c8af473361dcc10644c330096.zip | |
r8932: Handle non-anonymous unions and structures better.
(This used to be commit 04f993721574b4532962b5845faa4cb40a90ca38)
| -rw-r--r-- | source4/build/pidl/smb_interfaces.yp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/build/pidl/smb_interfaces.yp b/source4/build/pidl/smb_interfaces.yp index bfb5dc7ed7..f8c34eacdc 100644 --- a/source4/build/pidl/smb_interfaces.yp +++ b/source4/build/pidl/smb_interfaces.yp @@ -24,9 +24,9 @@ definition: struct: STRUCT optional_identifier '{' elements '}' pointers optional_identifiers ';' { - my $name = defined($_[2]) ? $_[2] : $_[7]; { - "NAME" => $name, + "NAME" => $_[7], + "STRUCT_NAME" => $_[2], "TYPE" => "struct", "DATA" => $_[4], } @@ -36,9 +36,9 @@ struct: STRUCT optional_identifier '{' elements '}' pointers optional_identifier union: UNION optional_identifier '{' elements '}' pointers optional_identifier ';' { - my $name = defined($_[2]) ? $_[2] : $_[7]; { - "NAME" => $name, + "NAME" => $_[7], + "UNION_NAME" => $_[2], "TYPE" => "union", "DATA" => $_[4], } |