From 240b470f4404b6a3517312827b74f775ae85a855 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 28 Feb 2007 00:35:21 +0000
Subject: r21575: Fix handling of is_scalar() for declares. (This used to be
 commit f0bc29df7297f8f91175091e5f4b14f4ae4b0591)

---
 source4/pidl/lib/Parse/Pidl/Typelist.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'source4/pidl/lib/Parse')

diff --git a/source4/pidl/lib/Parse/Pidl/Typelist.pm b/source4/pidl/lib/Parse/Pidl/Typelist.pm
index 8e311554bc..e635411f3c 100644
--- a/source4/pidl/lib/Parse/Pidl/Typelist.pm
+++ b/source4/pidl/lib/Parse/Pidl/Typelist.pm
@@ -138,7 +138,8 @@ sub is_scalar($)
 	return 1 if (ref($type) eq "HASH" and $type->{TYPE} eq "SCALAR");
 
 	if (my $dt = getType($type)) {
-		return is_scalar($dt->{DATA}) if ($dt->{TYPE} eq "TYPEDEF");
+		return is_scalar($dt->{DATA}) if ($dt->{TYPE} eq "TYPEDEF" or 
+		                                  $dt->{TYPE} eq "DECLARE");
 		return 1 if ($dt->{TYPE} eq "SCALAR" or $dt->{TYPE} eq "ENUM" or 
 			         $dt->{TYPE} eq "BITMAP");
 	}
-- 
cgit