blob: ccb754b1a1adeb8ae648ddeaa4dd655fbbc5eb8e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
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
|
