merge patched into master
[serna.git] / debian / patches / 0005-Work-around-including-two-bison-parsers-in-Tokenizer.patch
1 From d98f67d24d1ee96137e7c2a09eb5e5f5cbf8ddeb Mon Sep 17 00:00:00 2001
2 From: Joachim Breitner <mail@joachim-breitner.de>
3 Date: Tue, 10 Nov 2009 10:24:42 +0100
4 Subject: Work around including two bison parsers in Tokenizer.cxx
5
6 ---
7  sfworks/xslt/impl/Tokenizer.cxx |    3 +++
8  1 files changed, 3 insertions(+), 0 deletions(-)
9
10 diff --git a/sfworks/xslt/impl/Tokenizer.cxx b/sfworks/xslt/impl/Tokenizer.cxx
11 index eb91f52..fa34d6b 100644
12 --- a/sfworks/xslt/impl/Tokenizer.cxx
13 +++ b/sfworks/xslt/impl/Tokenizer.cxx
14 @@ -33,7 +33,10 @@
15  #include "xslt/xsltParser.hpp"
16  #ifdef USE_XPATH3
17  # include "xpath/impl3/Tokenizer.h"
18 +#undef YYTOKENTYPE
19 +#define yytokentype xpath_tokentype
20  # include "xpath/xpathParser.hpp"
21 +#undef yytokentype
22  # include "xpath/impl3/ExprImpl.h"
23  #else
24  # include "xpath/impl/Tokenizer.h"
25 -- 
26 1.6.6
27