* gengtype-yacc.y (option): Avoid use of non-constant struct

	initializer.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@83546 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4068b8d..8bcc51e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-23  Richard Sandiford  <rsandifo@redhat.com>
+
+       * gengtype-yacc.y (option): Avoid use of non-constant struct
+       initializer.
+
 2004-06-23  Nathan Sidwell  <nathan@codesourcery.com>
 
        * doc/extend.texi (Function Attributes): Alphabetize.

diff --git a/gcc/gengtype-yacc.y b/gcc/gengtype-yacc.y
index 2e7b6a7..449a515 100644 (file)
--- a/gcc/gengtype-yacc.y
+++ b/gcc/gengtype-yacc.y
@@ -282,8 +282,11 @@ option:   ID
            { $$ = create_option ($1, adjust_field_type ($3, NULL)); }
        | NESTED_PTR '(' type ',' stringseq ',' stringseq ')'
            {
-             struct nested_ptr_data d =
-               { adjust_field_type ($3, NULL), $5, $7 };
+             struct nested_ptr_data d;
+
+             d.type = adjust_field_type ($3, NULL);
+             d.convert_to = $5;
+             d.convert_from = $7;
              $$ = create_option ("nested_ptr",
                                  xmemdup (&d, sizeof (d), sizeof (d)));
            }