wok diff libwebkit-video/stuff/WebCore_xml_XPathParser.cpp_124099.diff @ rev 20255

firefox, thunderbird: try to force i686
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Mar 13 21:40:37 2018 +0100 (2018-03-13)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/libwebkit-video/stuff/WebCore_xml_XPathParser.cpp_124099.diff	Tue Mar 13 21:40:37 2018 +0100
     1.3 @@ -0,0 +1,39 @@
     1.4 +Index: trunk/Source/WebCore/xml/XPathParser.cpp
     1.5 +===================================================================
     1.6 +--- trunk/Source/WebCore/xml/XPathParser.cpp	(revision 97771)
     1.7 ++++ trunk/Source/WebCore/xml/XPathParser.cpp	(revision 124099)
     1.8 +@@ -33,22 +33,19 @@
     1.9 + #include "XPathException.h"
    1.10 + #include "XPathNSResolver.h"
    1.11 ++#include "XPathPath.h"
    1.12 + #include "XPathStep.h"
    1.13 + #include <wtf/StdLibExtras.h>
    1.14 + #include <wtf/text/StringHash.h>
    1.15 + 
    1.16 +-int xpathyyparse(void*);
    1.17 +-
    1.18 ++using namespace WebCore;
    1.19 + using namespace WTF;
    1.20 + using namespace Unicode;
    1.21 +-
    1.22 +-namespace WebCore {
    1.23 +-namespace XPath {
    1.24 +-
    1.25 +-class LocationPath;
    1.26 +-
    1.27 +-#include "XPathGrammar.h"    
    1.28 ++using namespace XPath;
    1.29 ++
    1.30 ++extern int xpathyyparse(WebCore::XPath::Parser*);
    1.31 ++#include "XPathGrammar.h"
    1.32 + 
    1.33 + Parser* Parser::currentParser = 0;
    1.34 +-    
    1.35 ++
    1.36 + enum XMLCat { NameStart, NameCont, NotPartOfName };
    1.37 + 
    1.38 +@@ -631,4 +628,2 @@
    1.39 + }
    1.40 + 
    1.41 +-}
    1.42 +-}