--- wine-0.9.8/tools/wrc/parser.l.old	2006-02-26 01:44:59.000000000 +0100
+++ wine-0.9.8/tools/wrc/parser.l	2006-02-26 01:45:16.000000000 +0100
@@ -68,7 +68,7 @@
  */
 
 /* Exclusive string handling */
-%x yystr
+%x yyystr
 /* Exclusive unicode string handling */
 %x yylstr
 /* Exclusive rcdata single quoted data handling */
@@ -477,47 +477,47 @@
 	/*
 	 * Normal string scanning
 	 */
-\"			yy_push_state(yystr); cbufidx = 0;
-<yystr>\"{ws}+	|
-<yystr>\"		{
+\"			yy_push_state(yyystr); cbufidx = 0;
+<yyystr>\"{ws}+	|
+<yyystr>\"		{
 				yy_pop_state();
 				yylval.str = get_buffered_cstring();
 				return tSTRING;
 			}
-<yystr>\\[0-7]{1,3}	{ /* octal escape sequence */
+<yyystr>\\[0-7]{1,3}	{ /* octal escape sequence */
 				int result;
 				result = strtol(yytext+1, 0, 8);
 				if ( result > 0xff )
 					yyerror("Character constant out of range");
 				addcchar((char)result);
 			}
-<yystr>\\x[0-9a-fA-F]{2} {  /* hex escape sequence */
+<yyystr>\\x[0-9a-fA-F]{2} {  /* hex escape sequence */
 				int result;
 				result = strtol(yytext+2, 0, 16);
 				addcchar((char)result);
 			}
-<yystr>\\x[0-9a-fA-F]	{  yyerror("Invalid hex escape sequence '%s'", yytext); }
+<yyystr>\\x[0-9a-fA-F]	{  yyerror("Invalid hex escape sequence '%s'", yytext); }
 
-<yystr>\\[0-9]+		yyerror("Bad escape sequence");
-<yystr>\\\n{ws}*	line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */
-<yystr>\\a		addcchar('\a');
-<yystr>\\b		addcchar('\b');
-<yystr>\\f		addcchar('\f');
-<yystr>\\n		addcchar('\n');
-<yystr>\\r		addcchar('\r');
-<yystr>\\t		addcchar('\t');
-<yystr>\\v		addcchar('\v');
-<yystr>\\.		addcchar(yytext[1]);
-<yystr>\\\r\n		addcchar(yytext[2]); line_number++; char_number = 1;
-<yystr>[^\\\n\"]+	{
+<yyystr>\\[0-9]+		yyerror("Bad escape sequence");
+<yyystr>\\\n{ws}*	line_number++; char_number = 1; /* backslash at EOL continues string after leading whitespace on next line */
+<yyystr>\\a		addcchar('\a');
+<yyystr>\\b		addcchar('\b');
+<yyystr>\\f		addcchar('\f');
+<yyystr>\\n		addcchar('\n');
+<yyystr>\\r		addcchar('\r');
+<yyystr>\\t		addcchar('\t');
+<yyystr>\\v		addcchar('\v');
+<yyystr>\\.		addcchar(yytext[1]);
+<yyystr>\\\r\n		addcchar(yytext[2]); line_number++; char_number = 1;
+<yyystr>[^\\\n\"]+	{
 				char *yptr = yytext;
 				while(*yptr)
 					addcchar(*yptr++);
 			}
-<yystr>\"\"		addcchar('\"');		/* "bla""bla"   -> "bla\"bla" */
-<yystr>\\\"\"		addcchar('\"');		/* "bla\""bla"  -> "bla\"bla" */
-<yystr>\"{ws}+\"	;			/* "bla" "bla"  -> "blabla" */
-<yystr>\n		yyerror("Unterminated string");
+<yyystr>\"\"		addcchar('\"');		/* "bla""bla"   -> "bla\"bla" */
+<yyystr>\\\"\"		addcchar('\"');		/* "bla\""bla"  -> "bla\"bla" */
+<yyystr>\"{ws}+\"	;			/* "bla" "bla"  -> "blabla" */
+<yyystr>\n		yyerror("Unterminated string");
 
 	/*
 	 * Raw data scanning