From 9d79025e5bf384bd1dbee83ded5773625835d5ba Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 19 Jan 2005 21:38:27 +0000
Subject: 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)

---
 source4/build/pidl/util.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4')

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;
     }
 
-- 
cgit