build: a more portable way of finding waf in makefiles

[sfrench/samba-autobuild/.git] / pidl / idl.yp

diff --git a/pidl/idl.yp b/pidl/idl.yp
index 399ff74f41f40328242c6d9f4d398c3ef879372e..b3d5ed16ac0657c1d5994531aeed720629528400 100644 (file)
--- a/pidl/idl.yp
+++ b/pidl/idl.yp
@@ -169,13 +169,14 @@ function:
 ;
 
 typedef:
-       property_list 'typedef' type identifier array_len ';'
+       property_list 'typedef' type pointers identifier array_len ';'
        {{
                "TYPE" => "TYPEDEF",
                "PROPERTIES" => $_[1],
-               "NAME" => $_[4],
+               "NAME" => $_[5],
                "DATA" => $_[3],
-               "ARRAY_LEN" => $_[5],
+               "POINTERS" => $_[4],
+               "ARRAY_LEN" => $_[6],
                "FILE" => $_[0]->YYData->{FILE},
                "LINE" => $_[0]->YYData->{LINE},
         }}
@@ -189,6 +190,8 @@ usertype:
        enum
        |
        bitmap
+       |
+       pipe
 ;
 
 typedecl:
@@ -379,6 +382,17 @@ pointers:
        pointers '*'  { $_[1]+1 }
 ;
 
+pipe:
+       property_list 'pipe' type
+       {{
+               "TYPE" => "PIPE",
+               "PROPERTIES" => $_[1],
+               "DATA" => $_[3],
+               "FILE" => $_[0]->YYData->{FILE},
+               "LINE" => $_[0]->YYData->{LINE},
+       }}
+;
+
 element_list1:
        #empty
        { [] }
@@ -603,7 +617,7 @@ again:
                        if ($1 =~
                            /^(coclass|interface|import|importlib
                              |include|cpp_quote|typedef
-                             |union|struct|enum|bitmap
+                             |union|struct|enum|bitmap|pipe
                              |void|const|unsigned|signed)$/x) {
                                return $1;
                        }