Skip to content

A
angle
Commit 99a7f610 by zmo@google.com
Options

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/trunk@1831 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent ca23ae52
Showing with 7 additions and 9 deletions
src/common/version.h
#define MAJOR_VERSION 1 #define MAJOR_VERSION 1
#define MINOR_VERSION 0 #define MINOR_VERSION 0
#define BUILD_VERSION 0 #define BUILD_VERSION 0
#define BUILD_REVISION 1830 #define BUILD_REVISION 1831
#define STRINGIFY(x) #x #define STRINGIFY(x) #x
#define MACRO_STRINGIFY(x) STRINGIFY(x) #define MACRO_STRINGIFY(x) STRINGIFY(x)
......
src/compiler/preprocessor/ExpressionParser.cpp
...@@ -84,13 +84,12 @@ ...@@ -84,13 +84,12 @@
// This file is auto-generated by generate_parser.sh. DO NOT EDIT! // This file is auto-generated by generate_parser.sh. DO NOT EDIT!
#if defined(__GNUC__) #if defined(__GNUC__)
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
// Triggered by the auto-generated pplval variable. // Triggered by the auto-generated pplval variable.
#pragma GCC diagnostic ignored "-Wuninitialized" #if !defined(__clang__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
#if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#else
#pragma GCC diagnostic ignored "-Wuninitialized"
#endif #endif
#pragma GCC diagnostic warning "-Wunknown-pragmas"
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#pragma warning(disable: 4065 4701) #pragma warning(disable: 4065 4701)
#endif #endif
......
src/compiler/preprocessor/ExpressionParser.y
...@@ -21,13 +21,12 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser. ...@@ -21,13 +21,12 @@ WHICH GENERATES THE GLSL ES preprocessor expression parser.
// This file is auto-generated by generate_parser.sh. DO NOT EDIT! // This file is auto-generated by generate_parser.sh. DO NOT EDIT!
#if defined(__GNUC__) #if defined(__GNUC__)
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
// Triggered by the auto-generated pplval variable. // Triggered by the auto-generated pplval variable.
#pragma GCC diagnostic ignored "-Wuninitialized" #if !defined(__clang__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
#if ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
#else
#pragma GCC diagnostic ignored "-Wuninitialized"
#endif #endif
#pragma GCC diagnostic warning "-Wunknown-pragmas"
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#pragma warning(disable: 4065 4701) #pragma warning(disable: 4065 4701)
#endif #endif
......
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