From 5475c9f9785e11638bc5ec47aa84a169b0284bbb Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 11 Nov 2003 07:55:41 +0000
Subject: added support for 8 byte aligned HYPER_T (This used to be commit
 259d5d7a0e2fa51d5d2ee36431c9e89784ee4a0c)

---
 source4/build/pidl/parser.pm | 3 ++-
 source4/build/pidl/util.pm   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/source4/build/pidl/parser.pm b/source4/build/pidl/parser.pm
index 90a1998a50..004a9b971a 100644
--- a/source4/build/pidl/parser.pm
+++ b/source4/build/pidl/parser.pm
@@ -60,7 +60,8 @@ sub find_size_var($$)
 sub struct_alignment($)
 {
 	my $s = shift;
-	my $align = 1;
+	# why do we need a minimum alignment of 4 ?? 
+	my $align = 4;
 	for my $e (@{$s->{ELEMENTS}}) {
 		if ($align < util::type_align($e)) {
 			$align = util::type_align($e);
diff --git a/source4/build/pidl/util.pm b/source4/build/pidl/util.pm
index d6c493398c..267cf36fef 100644
--- a/source4/build/pidl/util.pm
+++ b/source4/build/pidl/util.pm
@@ -181,7 +181,7 @@ sub is_scalar_type($)
     return 1, if ($type eq "uint8");
     return 1, if ($type eq "uint16");
     return 1, if ($type eq "NTTIME");
-    return 1, if ($type eq "hyper");
+    return 1, if ($type eq "HYPER_T");
     return 1, if ($type eq "wchar_t");
 
     return 0;
@@ -205,7 +205,7 @@ sub type_align($)
     return 1, if ($type eq "uint8");
     return 2, if ($type eq "uint16");
     return 4, if ($type eq "NTTIME");
-    return 8, if ($type eq "hyper");
+    return 8, if ($type eq "HYPER_T");
     return 2, if ($type eq "wchar_t");
 
     return 0;
-- 
cgit