svn commit: samba r4858 - in branches/SAMBA_4_0/source/build/pidl: .

[tridge at samba.org]

Author: tridge
Date: 2005-01-19 21:38:27 +0000 (Wed, 19 Jan 2005)
New Revision: 4858

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=4858

Log:
a better fix for alignment of enumerated types (I'm not even sure why
the last fix worked at all)




Modified:
   branches/SAMBA_4_0/source/build/pidl/util.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/util.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/util.pm	2005-01-19 21:20:27 UTC (rev 4857)
+++ branches/SAMBA_4_0/source/build/pidl/util.pm	2005-01-19 21:38:27 UTC (rev 4858)
@@ -331,12 +331,12 @@
     if (need_wire_pointer($e)) {
 	    return 4;
     }
-    if (my $ret = $type_alignments{$type}) {
-	    return $ret;
+
+    if (is_enum($type)) {
+	    $type = enum_type_fn(get_enum($type));
     }
 
-    if (is_enum($type)) {
-	    my $ret = type_align(get_enum($type));
+    if (my $ret = $type_alignments{$type}) {
 	    return $ret;
     }