| Index: third_party/WebKit/Source/wtf/Compiler.h
|
| diff --git a/third_party/WebKit/Source/wtf/Compiler.h b/third_party/WebKit/Source/wtf/Compiler.h
|
| index c2e509cf4f2b7078cab20f38b1c7e7a7ae7960f3..ba3d63d61edbd18eee47c27f09972f714da3d259 100644
|
| --- a/third_party/WebKit/Source/wtf/Compiler.h
|
| +++ b/third_party/WebKit/Source/wtf/Compiler.h
|
| @@ -27,7 +27,8 @@
|
| #define WTF_Compiler_h
|
|
|
| /* COMPILER() - the compiler being used to build the project */
|
| -#define COMPILER(WTF_FEATURE) (defined WTF_COMPILER_##WTF_FEATURE && WTF_COMPILER_##WTF_FEATURE)
|
| +#define COMPILER(WTF_FEATURE) \
|
| + (defined WTF_COMPILER_##WTF_FEATURE && WTF_COMPILER_##WTF_FEATURE)
|
|
|
| /* ==== COMPILER() - the compiler being used to build the project ==== */
|
|
|
| @@ -44,8 +45,10 @@
|
| /* COMPILER(GCC) - GNU Compiler Collection (and Clang when compiling for platforms other than Windows). */
|
| #if defined(__GNUC__)
|
| #define WTF_COMPILER_GCC 1
|
| -#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
|
| -#define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))
|
| +#define GCC_VERSION \
|
| + (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
|
| +#define GCC_VERSION_AT_LEAST(major, minor, patch) \
|
| + (GCC_VERSION >= (major * 10000 + minor * 100 + patch))
|
| #else
|
| /* Define this for !GCC compilers, just so we can write things like GCC_VERSION_AT_LEAST(4, 1, 0). */
|
| #define GCC_VERSION_AT_LEAST(major, minor, patch) 0
|
| @@ -53,7 +56,6 @@
|
|
|
| /* ==== Compiler features ==== */
|
|
|
| -
|
| /* ALWAYS_INLINE */
|
|
|
| #ifndef ALWAYS_INLINE
|
| @@ -66,7 +68,6 @@
|
| #endif
|
| #endif
|
|
|
| -
|
| /* NEVER_INLINE */
|
|
|
| #ifndef NEVER_INLINE
|
| @@ -79,7 +80,6 @@
|
| #endif
|
| #endif
|
|
|
| -
|
| /* UNLIKELY */
|
|
|
| #ifndef UNLIKELY
|
| @@ -90,7 +90,6 @@
|
| #endif
|
| #endif
|
|
|
| -
|
| /* LIKELY */
|
|
|
| #ifndef LIKELY
|
| @@ -101,7 +100,6 @@
|
| #endif
|
| #endif
|
|
|
| -
|
| /* NO_RETURN */
|
|
|
| #ifndef NO_RETURN
|
| @@ -114,21 +112,18 @@
|
| #endif
|
| #endif
|
|
|
| -
|
| /* WARN_UNUSED_RETURN */
|
|
|
| #if COMPILER(GCC)
|
| -#define WARN_UNUSED_RETURN __attribute__ ((warn_unused_result))
|
| +#define WARN_UNUSED_RETURN __attribute__((warn_unused_result))
|
| #else
|
| #define WARN_UNUSED_RETURN
|
| #endif
|
|
|
| -
|
| /* ALLOW_UNUSED_LOCAL */
|
|
|
| #define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0
|
|
|
| -
|
| /* OBJC_CLASS */
|
|
|
| #ifndef OBJC_CLASS
|
| @@ -139,7 +134,6 @@
|
| #endif
|
| #endif
|
|
|
| -
|
| /* WTF_PRETTY_FUNCTION */
|
|
|
| #if COMPILER(GCC)
|
| @@ -154,7 +148,8 @@
|
| * unrelated objects (-fsanitize=cfi-unrelated-cast or -fsanitize=vptr). */
|
|
|
| #if COMPILER(CLANG)
|
| -#define NO_SANITIZE_UNRELATED_CAST __attribute__((no_sanitize("cfi-unrelated-cast", "vptr")))
|
| +#define NO_SANITIZE_UNRELATED_CAST \
|
| + __attribute__((no_sanitize("cfi-unrelated-cast", "vptr")))
|
| #else
|
| #define NO_SANITIZE_UNRELATED_CAST
|
| #endif
|
|
|