| commit | b3077d086b365b1d54c3d755df19c6f8f349a562 | [log] [tgz] |
|---|---|---|
| author | daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> | Fri Jan 11 04:12:09 2013 +0000 |
| committer | daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> | Fri Jan 11 04:12:09 2013 +0000 |
| tree | 9777eda55bc65f42b016137597132736d27f7ca7 | |
| parent | b35da7afe3c262235d66aeed64579c57b2f7ac0b [diff] [blame] |
Upstream various build fixes from WebKit to ANGLE to make updating ANGLE in WebKit easier. a) http://trac.webkit.org/changeset/127747 b) http://trac.webkit.org/changeset/128539 c) http://trac.webkit.org/changeset/122870 - Specifically, items #3 and #4 in this changeset's commit message. Review URL: https://codereview.appspot.com/7040045 Author: maxvujovic@gmail.com ------ Upodate preprocessor.vcxproj to reflect changes in r1640. Review URL: https://codereview.appspot.com/7061044 git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1703 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/compiler/preprocessor/ExpressionParser.y b/src/compiler/preprocessor/ExpressionParser.y index 832ad40..7a7f534 100644 --- a/src/compiler/preprocessor/ExpressionParser.y +++ b/src/compiler/preprocessor/ExpressionParser.y
@@ -21,8 +21,11 @@ // This file is auto-generated by generate_parser.sh. DO NOT EDIT! #if defined(__GNUC__) +#pragma GCC diagnostic ignored "-Wunknown-pragmas" // Triggered by the auto-generated pplval variable. #pragma GCC diagnostic ignored "-Wuninitialized" +#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#pragma GCC diagnostic warning "-Wunknown-pragmas" #elif defined(_MSC_VER) #pragma warning(disable: 4065 4701) #endif @@ -32,7 +35,7 @@ #include <cassert> #include <sstream> -#include "Diagnostics.h" +#include "DiagnosticsBase.h" #include "Lexer.h" #include "Token.h" @@ -42,6 +45,8 @@ #include <stdint.h> typedef intmax_t YYSTYPE; #endif // _MSC_VER +#define YYENABLE_NLS 0 +#define YYLTYPE_IS_TRIVIAL 1 #define YYSTYPE_IS_TRIVIAL 1 #define YYSTYPE_IS_DECLARED 1