PR/5020: STRINGTABLE doesn't work in 2.18 windres.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5dcedfbbf796584b82ed368d2f9b5eb39d0eb65a..f3438f13a09dc7763da8a4bed140487586c26798 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-11  Kai Tietz  <kai.tietz@onevision.com>
+
+       * rcparse.y: (string_data): Removed ill token removal.
+
 2007-09-10  Alan Modra  <amodra@bigpond.net.au>
 
        PR 5011

diff --git a/binutils/rcparse.y b/binutils/rcparse.y
index 64ea96603da216de80fa999567dc241af6e50de5..00a060d79d03c7ca9dfd68f0363dfdb730dce957 100644 (file)
--- a/binutils/rcparse.y
+++ b/binutils/rcparse.y
@@ -1263,17 +1263,18 @@ string_data:
        | string_data numexpr res_unicode_string_concat
          {
            define_stringtable (&sub_res_info, $2, $3);
-           if (yychar != YYEMPTY)
-             YYERROR;
            rcparse_discard_strings ();
          }
        | string_data numexpr ',' res_unicode_string_concat
          {
            define_stringtable (&sub_res_info, $2, $4);
-           if (yychar != YYEMPTY)
-             YYERROR;
            rcparse_discard_strings ();
          }
+       | string_data error
+         {
+           rcparse_warning (_("invalid stringtable resource."));
+           abort ();
+         }
        ;
 
 rcdata_id: