giscanner/scannerparser.y: Avoid C99ism

Move variable declarations to the start of block.

https://bugzilla.gnome.org/show_bug.cgi?id=681820

diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y
index 06a10efad969d23e3395bde99eead0b169c8c3e6..81a9374f0f0c19ece25eeebf24b5804e31fe9d9f 100644 (file)
--- a/giscanner/scannerparser.y
+++ b/giscanner/scannerparser.y
@@ -814,11 +814,12 @@ type_specifier
 struct_or_union_specifier
        : struct_or_union identifier_or_typedef_name '{' struct_declaration_list '}'
          {
 struct_or_union_specifier
        : struct_or_union identifier_or_typedef_name '{' struct_declaration_list '}'
          {

+               GISourceSymbol *sym;

                $$ = $1;
                $$->name = $2;
                $$->child_list = $4;
 
                $$ = $1;
                $$->name = $2;
                $$->child_list = $4;
 

-               GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_filename, lineno);
+               sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_filename, lineno);

                if ($$->type == CTYPE_STRUCT) {
                        sym->type = CSYMBOL_TYPE_STRUCT;
                } else if ($$->type == CTYPE_UNION) {
                if ($$->type == CTYPE_STRUCT) {
                        sym->type = CSYMBOL_TYPE_STRUCT;
                } else if ($$->type == CTYPE_UNION) {


@@ -1468,9 +1469,9 @@ gi_source_scanner_parse_macros (GISourceScanner *scanner, GList *filenames)
   FILE *fmacros =
     fdopen (g_file_open_tmp ("gen-introspect-XXXXXX.h", &tmp_name, &error),
             "w+");
   FILE *fmacros =
     fdopen (g_file_open_tmp ("gen-introspect-XXXXXX.h", &tmp_name, &error),
             "w+");

+  GList *l;

   g_unlink (tmp_name);
 
   g_unlink (tmp_name);
 

-  GList *l;

   for (l = filenames; l != NULL; l = l->next)
     {
       FILE *f = fopen (l->data, "r");
   for (l = filenames; l != NULL; l = l->next)
     {
       FILE *f = fopen (l->data, "r");