Fix ANGLE build failures by re-comitting the changes in http://trac.webkit.org/changeset/154223

on top of the library updates introduced by http://trac.webkit.org/changeset/159533.

Rubber-stamped by Babak Shafiei.

* src/compiler/glslang.l:
* src/compiler/glslang_lex.cpp:
* src/compiler/preprocessor/Tokenizer.cpp:
* src/compiler/preprocessor/Tokenizer.l:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160194 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent da1151f2
2013-12-05 Matthew Hanson <matthew_hanson@apple.com>
Fix ANGLE build failures by re-comitting the changes in http://trac.webkit.org/changeset/154223
on top of the library updates introduced by http://trac.webkit.org/changeset/159533.
Rubber-stamped by Babak Shafiei.
* src/compiler/glslang.l:
* src/compiler/glslang_lex.cpp:
* src/compiler/preprocessor/Tokenizer.cpp:
* src/compiler/preprocessor/Tokenizer.l:
2013-12-03 Daniel Bates <dabates@apple.com>
ANGLE fails to build with trunk clang: unused constant kTraceBufferLen
......
......@@ -33,6 +33,12 @@ WHICH GENERATES THE GLSL ES LEXER (glslang_lex.cpp).
#pragma warning(disable: 4505)
#pragma warning(disable: 4701)
#endif
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wdeprecated-register"
#endif
}
%{
......@@ -252,6 +258,10 @@ O [0-7]
%%
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
yy_size_t string_input(char* buf, yy_size_t max_size, yyscan_t yyscanner) {
pp::Token token;
yyget_extra(yyscanner)->preprocessor.lex(&token);
......
......@@ -19,6 +19,12 @@
#pragma warning(disable: 4701)
#endif
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wdeprecated-register"
#endif
#line 25 "./glslang_lex.cpp"
......@@ -2861,6 +2867,10 @@ void yyfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
yy_size_t string_input(char* buf, yy_size_t max_size, yyscan_t yyscanner) {
pp::Token token;
yyget_extra(yyscanner)->preprocessor.lex(&token);
......
......@@ -529,6 +529,12 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh.
#pragma GCC diagnostic ignored "-Wmissing-noreturn"
#endif
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wdeprecated-register"
#endif
typedef std::string YYSTYPE;
typedef pp::SourceLocation YYLTYPE;
......@@ -2203,6 +2209,10 @@ void ppfree (void * ptr , yyscan_t yyscanner)
#define YYTABLES_NAME "yytables"
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
namespace pp {
Tokenizer::Tokenizer(Diagnostics* diagnostics)
......
......@@ -33,6 +33,12 @@ IF YOU MODIFY THIS FILE YOU ALSO NEED TO RUN generate_parser.sh.
#pragma GCC diagnostic ignored "-Wmissing-noreturn"
#endif
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunknown-pragmas"
#pragma clang diagnostic ignored "-Wdeprecated-register"
#endif
typedef std::string YYSTYPE;
typedef pp::SourceLocation YYLTYPE;
......@@ -265,6 +271,10 @@ FRACTIONAL_CONSTANT ({DIGIT}*"."{DIGIT}+)|({DIGIT}+".")
%%
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
namespace pp {
Tokenizer::Tokenizer(Diagnostics* diagnostics)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment