main/wine: build fixes for bison-3

1 files changed, 57 insertions, 0 deletions

diff --git a/main/wine/wbemprox-Use-bison-directives-instead-of-defines.patch b/main/wine/wbemprox-Use-bison-directives-instead-of-defines.patch
new file mode 100644
index 0000000000..2ad146c0cd
--- /dev/null
+++ b/main/wine/wbemprox-Use-bison-directives-instead-of-defines.patch
@@ -0,0 +1,57 @@
+From c14e322a92a24e704836c5c12207c694a30e805f Mon Sep 17 00:00:00 2001
+From: Alexandre Julliard <julliard@winehq.org>
+Date: Thu, 1 Aug 2013 12:00:44 +0200
+Subject: [PATCH] wbemprox: Use bison directives instead of defines to specify
+ extra lexer parameters.
+
+---
+ dlls/wbemprox/wql.y | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+diff --git a/dlls/wbemprox/wql.y b/dlls/wbemprox/wql.y
+index 8e347c2..58663d0 100644
+--- a/dlls/wbemprox/wql.y
++++ b/dlls/wbemprox/wql.y
+@@ -30,11 +30,6 @@
+ #include "wine/debug.h"
+ #include "wine/unicode.h"
+ 
+-#define YYLEX_PARAM ctx
+-#define YYPARSE_PARAM ctx
+-#define YYERROR_DEBUG 1
+-#define YYERROR_VERBOSE 1
+-
+ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox);
+ 
+ struct parser
+@@ -181,7 +176,7 @@ static struct expr *expr_propval( struct parser *parser, const struct property *
+     return e;
+ }
+ 
+-static int wql_error( const char *str );
++static int wql_error( struct parser *parser, const char *str );
+ static int wql_lex( void *val, struct parser *parser );
+ 
+ #define PARSER_BUBBLE_UP_VIEW( parser, result, current_view ) \
+@@ -190,6 +185,9 @@ static int wql_lex( void *val, struct parser *parser );
+ 
+ %}
+ 
++%lex-param { struct parser *ctx }
++%parse-param { struct parser *ctx }
++%error-verbose
+ %pure-parser
+ 
+ %union
+@@ -691,7 +689,7 @@ static int wql_lex( void *p, struct parser *parser )
+     return token;
+ }
+ 
+-static int wql_error( const char *str )
++static int wql_error( struct parser *parser, const char *str )
+ {
+     ERR("%s\n", str);
+     return 0;
+-- 
+1.8.1.6
+