Changeset 745 for trunk/server/pidl/idl.yp

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• pidl/idl.yp (modified) (3 diffs)

trunk/server/pidl/idl.yp

@@ -170 +170 @@
 
 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},
@@ -387 +388 @@
                 "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},
@@ -653 +678 @@
         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;