From 1cd50fc199903f3db483c2d61f18a08da18c1578 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Mayer?= <jmayer@loplof.de>
Date: Mon, 14 Aug 2006 21:24:00 +0000
Subject: Update from samba tree revision 16838 to 17541
 ============================ Samba log start ============ svn: When
 specifying working copy paths, only one target may be given
 ============================ Samba log end ==============

svn path=/trunk/; revision=18898
---
 tools/pidl/idl.yp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'tools/pidl/idl.yp')

diff --git a/tools/pidl/idl.yp b/tools/pidl/idl.yp
index 62f636cb00..1f6f22e1a1 100644
--- a/tools/pidl/idl.yp
+++ b/tools/pidl/idl.yp
@@ -109,7 +109,7 @@ declare: 'declare' property_list decl_type identifier';'
         }}
 ;
 
-decl_type: decl_enum | decl_bitmap
+decl_type: decl_enum | decl_bitmap | decl_union
 ;
 
 decl_enum: 'enum' 
@@ -124,6 +124,12 @@ decl_bitmap: 'bitmap'
         }}
 ;
 
+decl_union: 'union' 
+        {{
+                     "TYPE" => "UNION"
+        }}
+;
+
 typedef: 'typedef' property_list type identifier array_len ';' 
         {{
 	             "TYPE" => "TYPEDEF", 
-- 
cgit v1.2.3