diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-08-16 12:57:23 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-08-16 12:57:23 +0000 |
| commit | 00d8a7996324d05f7c3bda266691f68c4cfd587f (patch) | |
| tree | 1fb774c504038075d923bc456c755f7b22978d53 /main/wine/wrc-Remove-non-bison-compatibility-code.patch | |
| parent | 92f0c4a8fb6a46befb00de60325acfd5efffd771 (diff) | |
| download | aports-00d8a7996324d05f7c3bda266691f68c4cfd587f.tar.bz2 aports-00d8a7996324d05f7c3bda266691f68c4cfd587f.tar.xz | |
main/wine: build fixes for bison-3
Diffstat (limited to 'main/wine/wrc-Remove-non-bison-compatibility-code.patch')
| -rw-r--r-- | main/wine/wrc-Remove-non-bison-compatibility-code.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/main/wine/wrc-Remove-non-bison-compatibility-code.patch b/main/wine/wrc-Remove-non-bison-compatibility-code.patch new file mode 100644 index 000000000..ccb754b1a --- /dev/null +++ b/main/wine/wrc-Remove-non-bison-compatibility-code.patch @@ -0,0 +1,57 @@ +From 8fcac3b2bb8ce4cdbcffc126df779bf1be168882 Mon Sep 17 00:00:00 2001 +From: Alexandre Julliard <julliard@winehq.org> +Date: Thu, 1 Aug 2013 12:04:29 +0200 +Subject: [PATCH] wrc: Remove non-bison compatibility code. + +--- + tools/wrc/parser.y | 27 +-------------------------- + 1 file changed, 1 insertion(+), 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) +-- +1.8.1.6 + |