aboutsummaryrefslogtreecommitdiffstats
path: root/tools/pidl/idl.yp
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2006-08-14 21:24:00 +0000
committerJörg Mayer <jmayer@loplof.de>2006-08-14 21:24:00 +0000
commit1cd50fc199903f3db483c2d61f18a08da18c1578 (patch)
treecb1597dffc879ee700e6a767ee3fee02005905d1 /tools/pidl/idl.yp
parent49c07de8fb8218cb0ee9287ca416385c2818aba8 (diff)
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
Diffstat (limited to 'tools/pidl/idl.yp')
-rw-r--r--tools/pidl/idl.yp8
1 files changed, 7 insertions, 1 deletions
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",