From 3a1786650303267ec359c94c7d518cceb584fc53 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 13 Dec 2004 09:32:02 +0000
Subject: r4170: don't check array size for conformant arrays (they are checked
 separately) (This used to be commit e399834ae1aa9731d5d29c04d5b7b90e356dad6f)

---
 source4/build/pidl/parser.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/build/pidl/parser.pm')

diff --git a/source4/build/pidl/parser.pm b/source4/build/pidl/parser.pm
index 8fb74b2e0e..d6a27ddff2 100644
--- a/source4/build/pidl/parser.pm
+++ b/source4/build/pidl/parser.pm
@@ -286,7 +286,8 @@ sub CheckArraySizes($$)
 	my $e = shift;
 	my $var_prefix = shift;
 
-	if (util::has_property($e, "size_is")) {
+	if (!defined $e->{CONFORMANT_SIZE} && 
+	    util::has_property($e, "size_is")) {
 		my $size = find_size_var($e, util::array_size($e), $var_prefix);
 		pidl "\tif ($var_prefix$e->{NAME}) {\n";
 		check_null_pointer($size);
-- 
cgit