[multiple changes]

2002-10-21  Matthias Klose  <doko@debian.org>

        * Backport, without whitespace change:
        2002-06-19 Akim Demaille  <akim@epita.fr>
        * c-parse.in (initelt: identifier ':' initval): Add an empty
        action to fix a type clash.
        (aliasdecl, classdef): Add the missing closing `;'.

From-SVN: r58371

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 41f08fd32739c99faa58073baab8989397330bbd..68a36caae5a8d7d092fb5bc00d539eab6b440138 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2002-10-21  Matthias Klose  <doko@debian.org>
+
+       * Backport, without whitespace change:
+       2002-06-19 Akim Demaille  <akim@epita.fr>
+       * c-parse.in (initelt: identifier ':' initval): Add an empty
+       action to fix a type clash.
+       (aliasdecl, classdef): Add the missing closing `;'.
+
 Sat Oct 19 15:49:14 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
        * mmintrin.h (__m64): typedef it to v2si.

diff --git a/gcc/c-parse.in b/gcc/c-parse.in
index c7cbb16d38ec3e2cada74fdc616284524d6788db..2fc4359bf10332e24dec8fe1a8d9cf34767db7e8 100644 (file)
--- a/gcc/c-parse.in
+++ b/gcc/c-parse.in
@@ -1527,6 +1527,7 @@ initelt:
                  if (pedantic)
                    pedwarn ("obsolete use of designated initializer with `:'"); }
          initval
+               {}
        | initval
        ;
 
@@ -2700,12 +2701,14 @@ classdecl:
                {
                  objc_declare_class ($2);
                }
+       ;
 
 aliasdecl:
          ALIAS identifier identifier ';'
                {
                  objc_declare_alias ($2, $3);
                }
+       ;
 
 classdef:
          INTERFACE identifier protocolrefs '{'