Fix numerous missing dependencies in WAF build scripts

[samba.git] / pidl / idl.yp

diff --git a/pidl/idl.yp b/pidl/idl.yp
index dc8e293f765046eca4b3bb89e22b7a1b8e9999b7..b5c5185fbe1a78e9b8e6395c5eab53630f988915 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},
         }}
@@ -386,7 +387,31 @@ pipe:
        {{
                "TYPE" => "PIPE",
                "PROPERTIES" => $_[1],
-               "DATA" => $_[3],
+               "NAME" => undef,
+               "DATA" => {
+                       "TYPE" => "STRUCT",
+                       "PROPERTIES" => $_[1],
+                       "NAME" => undef,
+                       "ELEMENTS" => [{
+                               "NAME" => "count",
+                               "PROPERTIES" => $_[1],
+                               "POINTERS" => 0,
+                               "ARRAY_LEN" => [],
+                               "TYPE" => "uint3264",
+                               "FILE" => $_[0]->YYData->{FILE},
+                               "LINE" => $_[0]->YYData->{LINE},
+                       },{
+                               "NAME" => "array",
+                               "PROPERTIES" => $_[1],
+                               "POINTERS" => 0,
+                               "ARRAY_LEN" => [ "count" ],
+                               "TYPE" => $_[3],
+                               "FILE" => $_[0]->YYData->{FILE},
+                               "LINE" => $_[0]->YYData->{LINE},
+                       }],
+                       "FILE" => $_[0]->YYData->{FILE},
+                       "LINE" => $_[0]->YYData->{LINE},
+               },
                "FILE" => $_[0]->YYData->{FILE},
                "LINE" => $_[0]->YYData->{LINE},
        }}
@@ -652,11 +677,17 @@ sub parse_file($$)
        my $saved_delim = $/;
        undef $/;
        my $cpp = $ENV{CPP};
+       my $options = "";
        if (! defined $cpp) {
-               $cpp = "cpp";
+               if (defined $ENV{CC}) {
+                       $cpp = "$ENV{CC}";
+                       $options = "-E";
+               } else {
+                       $cpp = "cpp";
+               }
        }
        my $includes = join('',map { " -I$_" } @$incdirs);
-       my $data = `$cpp -D__PIDL__$includes -xc $filename`;
+       my $data = `$cpp $options -D__PIDL__$includes -xc "$filename"`;
        $/ = $saved_delim;
 
        return parse_string($data, $filename);