diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-13 11:22:08 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-14 22:09:13 +0000 |
| commit | 5f5ef8df7562df4520fda6ad1fa07e9f1a27df30 (patch) | |
| tree | 530abda9a167089535ac6164bbcd6da03d8bb422 | |
| parent | 3869e72c9dfcd2a9dad81d14a4cc363bb45a6c3d (diff) | |
| download | qtwebengine-chromium-5f5ef8df7562df4520fda6ad1fa07e9f1a27df30.tar.gz | |
Fix building ANGLE on GCC
COMPILER_GCC is not defined here.
Change-Id: I664b7da04499fa04df0ed9f7667cbca63ee6bf39
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| -rw-r--r-- | chromium/third_party/angle/src/common/debug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/third_party/angle/src/common/debug.h b/chromium/third_party/angle/src/common/debug.h index 64783687b33..3bfafb5b931 100644 --- a/chromium/third_party/angle/src/common/debug.h +++ b/chromium/third_party/angle/src/common/debug.h @@ -248,7 +248,7 @@ std::ostream &FmtHex(std::ostream &os, T value) # define EVENT(message, ...) (void(0)) #endif -#if defined(COMPILER_GCC) || defined(__clang__) +#if defined(__GNUC__) || defined(__clang__) # define ANGLE_CRASH() __builtin_trap() #else # define ANGLE_CRASH() ((void)(*(volatile char *)0 = 0)), __assume(0) @@ -336,7 +336,7 @@ std::ostream &FmtHex(std::ostream &os, T value) # define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \ _Pragma("clang diagnostic push") _Pragma("clang diagnostic error \"-Wpadded\"") # define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("clang diagnostic pop") -#elif defined(COMPILER_GCC) +#elif defined(__GNUC__) # define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \ _Pragma("GCC diagnostic push") _Pragma("GCC diagnostic error \"-Wpadded\"") # define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("GCC diagnostic pop") |