diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-19 21:38:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:00 -0500 |
| commit | 9d79025e5bf384bd1dbee83ded5773625835d5ba (patch) | |
| tree | 2a1a7f159bcd6fab30fc3d18e5c9c5fc840d2f7d | |
| parent | f19049c9c9fcf891c638c56c13071d09a3a46c54 (diff) | |
| download | samba-9d79025e5bf384bd1dbee83ded5773625835d5ba.tar.gz samba-9d79025e5bf384bd1dbee83ded5773625835d5ba.tar.bz2 samba-9d79025e5bf384bd1dbee83ded5773625835d5ba.zip | |
r4858: a better fix for alignment of enumerated types (I'm not even sure why
the last fix worked at all)
(This used to be commit 99cef2e5a0412ede455cb1579541550efa49502a)
| -rw-r--r-- | source4/build/pidl/util.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/build/pidl/util.pm b/source4/build/pidl/util.pm index 39f84843cb..48fd9469b8 100644 --- a/source4/build/pidl/util.pm +++ b/source4/build/pidl/util.pm @@ -331,12 +331,12 @@ sub type_align($) if (need_wire_pointer($e)) { return 4; } - if (my $ret = $type_alignments{$type}) { - return $ret; - } if (is_enum($type)) { - my $ret = type_align(get_enum($type)); + $type = enum_type_fn(get_enum($type)); + } + + if (my $ret = $type_alignments{$type}) { return $ret; } |