Alexandre Julliard : wrc: Remove non-bison compatibility code.

Alexandre Julliard julliard at winehq.org
Thu Aug 1 14:25:45 CDT 2013


Module: wine
Branch: master
Commit: 8fcac3b2bb8ce4cdbcffc126df779bf1be168882
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8fcac3b2bb8ce4cdbcffc126df779bf1be168882

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Aug  1 12:04:29 2013 +0200

wrc: Remove non-bison compatibility code.

---

 tools/wrc/parser.y |   27 +--------------------------
 1 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/tools/wrc/parser.y b/tools/wrc/parser.y
index ad5fb98..ff59327 100644
--- a/tools/wrc/parser.y
+++ b/tools/wrc/parser.y
@@ -142,31 +142,6 @@
 #include "wingdi.h"
 #include "winuser.h"
 
-#if defined(YYBYACC)
-	/* Berkeley yacc (byacc) doesn't seem to know about these */
-	/* Some *BSD supplied versions do define these though */
-# ifndef YYEMPTY
-#  define YYEMPTY	(-1)	/* Empty lookahead value of yychar */
-# endif
-# ifndef YYLEX
-#  define YYLEX		yylex()
-# endif
-
-#elif defined(YYBISON)
-	/* Bison was used for original development */
-	/* #define YYEMPTY -2 */
-	/* #define YYLEX   yylex() */
-
-#else
-	/* No yacc we know yet */
-# if !defined(YYEMPTY) || !defined(YYLEX)
-#  error Yacc version/type unknown. This version needs to be verified for settings of YYEMPTY and YYLEX.
-# elif defined(__GNUC__)	/* gcc defines the #warning directive */
-#  warning Yacc version/type unknown. It defines YYEMPTY and YYLEX, but is not tested
-  /* #else we just take a chance that it works... */
-# endif
-#endif
-
 int want_nl = 0;	/* Signal flex that we need the next newline */
 int want_id = 0;	/* Signal flex that we need the next identifier */
 static stringtable_t *tagstt;	/* Stringtable tag.
@@ -2837,7 +2812,7 @@ static int rsrcid_to_token(int lookahead)
 
 	/* Get a token if we don't have one yet */
 	if(lookahead == YYEMPTY)
-		lookahead = YYLEX;
+		lookahead = yylex();
 
 	/* Only numbers are possibly interesting */
 	switch(lookahead)




More information about the wine-cvs mailing list