| commit | eb68fd0ebb8623e28b8b777fd8c501bdb4f0d179 | [log] [tgz] |
|---|---|---|
| author | shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> | Thu Feb 28 23:20:01 2013 +0000 |
| committer | shannon.woods@transgaming.com <shannon.woods@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> | Thu Feb 28 23:20:01 2013 +0000 |
| tree | 69742275631a9cfbf7f62db04f16f120bb353f88 | |
| parent | 550cd0988989cc3e117fb300c919504f7bd99c48 [diff] [blame] |
This pulls in mvujovic's build fix in WebKit ANGLE. Original patch: http://trac.webkit.org/changeset/139665 Review URL: https://codereview.appspot.com/7392044 git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1964 736b8ea6-26fd-11df-bfd4-992fa37f6226
diff --git a/src/compiler/preprocessor/ExpressionParser.cpp b/src/compiler/preprocessor/ExpressionParser.cpp index 0345ea9..4c4225d 100644 --- a/src/compiler/preprocessor/ExpressionParser.cpp +++ b/src/compiler/preprocessor/ExpressionParser.cpp
@@ -84,13 +84,12 @@ // 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" -#if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) +#if !defined(__clang__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) #pragma GCC diagnostic ignored "-Wmaybe-uninitialized" +#else +#pragma GCC diagnostic ignored "-Wuninitialized" #endif -#pragma GCC diagnostic warning "-Wunknown-pragmas" #elif defined(_MSC_VER) #pragma warning(disable: 4065 4701) #endif