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
2006-08-14 21:24:00 +00:00 · 2006-08-14 21:24:00 +00:00 · 1cd50fc199
parent 49c07de8fb
commit 1cd50fc199
2 changed files with 562 additions and 537 deletions
--- 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", 
--- a/tools/pidl/lib/Parse/Pidl/IDL.pm
+++ b/tools/pidl/lib/Parse/Pidl/IDL.pm