diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-02-11 02:05:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:41 -0500 |
| commit | 0de6851e83d075e8c001255990b2018acc4a56c2 (patch) | |
| tree | 9f5ebc9512992d2da6fcc7b9b034cfb9472b4077 /source4/build/pidl/header.pm | |
| parent | af7e9f2b5907a36d0d3c454d9ba9e49f98a11426 (diff) | |
| download | samba-0de6851e83d075e8c001255990b2018acc4a56c2.tar.gz samba-0de6851e83d075e8c001255990b2018acc4a56c2.tar.bz2 samba-0de6851e83d075e8c001255990b2018acc4a56c2.zip | |
r5320: Treat structs and unions somewhat more similarly:
- use same names in hashes (DATA -> ELEMENTS, etc)
- [case()] and [default] are no longer special case, they're just regular properties
(This used to be commit 6a0f599f822f5c42d93e78c13765804ab2223968)
Diffstat (limited to 'source4/build/pidl/header.pm')
| -rw-r--r-- | source4/build/pidl/header.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/pidl/header.pm b/source4/build/pidl/header.pm index c6b5fef3d3..fa3e669242 100644 --- a/source4/build/pidl/header.pm +++ b/source4/build/pidl/header.pm @@ -153,12 +153,12 @@ sub HeaderUnion($$) (defined $union->{PROPERTIES}) && HeaderProperties($union->{PROPERTIES}); $res .= "\nunion $name {\n"; $tab_depth++; - foreach my $e (@{$union->{DATA}}) { - if ($e->{TYPE} eq "UNION_ELEMENT") { - if (! defined $done{$e->{DATA}->{NAME}}) { - HeaderElement($e->{DATA}); + foreach my $e (@{$union->{ELEMENTS}}) { + if ($e->{TYPE} ne "EMPTY") { + if (! defined $done{$e->{NAME}}) { + HeaderElement($e); } - $done{$e->{DATA}->{NAME}} = 1; + $done{$e->{NAME}} = 1; } } $tab_depth--; |