glsl2: Remove unnecessary use of 'struct' before type names

In C++ you don't have to say 'struct' or 'class' if the declaration of
the type has been seen.  Some compilers will complain if you use
'struct' when 'class' should have been used and vice versa.

Fixes bugzilla #29539.

1 files changed, 18 insertions, 18 deletions

diff --git a/src/glsl/glsl_parser.ypp b/src/glsl/glsl_parser.ypp
index 1ee6da1d23a..e0b1d285046 100644
--- a/src/glsl/glsl_parser.ypp
+++ b/src/glsl/glsl_parser.ypp
@@ -59,21 +59,21 @@
       unsigned i;
    } type_qualifier;
 
-   struct ast_node *node;
-   struct ast_type_specifier *type_specifier;
-   struct ast_fully_specified_type *fully_specified_type;
-   struct ast_function *function;
-   struct ast_parameter_declarator *parameter_declarator;
-   struct ast_function_definition *function_definition;
-   struct ast_compound_statement *compound_statement;
-   struct ast_expression *expression;
-   struct ast_declarator_list *declarator_list;
-   struct ast_struct_specifier *struct_specifier;
-   struct ast_declaration *declaration;
+   ast_node *node;
+   ast_type_specifier *type_specifier;
+   ast_fully_specified_type *fully_specified_type;
+   ast_function *function;
+   ast_parameter_declarator *parameter_declarator;
+   ast_function_definition *function_definition;
+   ast_compound_statement *compound_statement;
+   ast_expression *expression;
+   ast_declarator_list *declarator_list;
+   ast_struct_specifier *struct_specifier;
+   ast_declaration *declaration;
 
    struct {
-      struct ast_node *cond;
-      struct ast_expression *rest;
+      ast_node *cond;
+      ast_expression *rest;
    } for_rest_statement;
 }
 
@@ -1191,12 +1191,12 @@ struct_specifier:
 struct_declaration_list:
 	struct_declaration
 	{
-	   $$ = (struct ast_node *) $1;
+	   $$ = (ast_node *) $1;
 	   $1->link.self_link();
 	}
 	| struct_declaration_list struct_declaration
 	{
-	   $$ = (struct ast_node *) $1;
+	   $$ = (ast_node *) $1;
 	   $$->link.insert_before(& $2->link);
 	}
 	;
@@ -1260,7 +1260,7 @@ statement:
 	;
 
 statement_matched:
-	compound_statement	{ $$ = (struct ast_node *) $1; }
+	compound_statement	{ $$ = (ast_node *) $1; }
 	| simple_statement
 	;
 
@@ -1294,7 +1294,7 @@ compound_statement:
 	;
 
 statement_no_new_scope:
-	compound_statement_no_new_scope { $$ = (struct ast_node *) $1; }
+	compound_statement_no_new_scope { $$ = (ast_node *) $1; }
 	| simple_statement
 	;
 
@@ -1383,7 +1383,7 @@ selection_statement_unmatched:
 condition:
 	expression
 	{
-	   $$ = (struct ast_node *) $1;
+	   $$ = (ast_node *) $1;
 	}
 	| fully_specified_type IDENTIFIER '=' initializer
 	{