diff options
| -rw-r--r-- | ipc/chromium/src/base/hash_tables.h | 8 | ||||
| -rw-r--r-- | layout/style/nsCSSPseudoElements.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/ipc/chromium/src/base/hash_tables.h b/ipc/chromium/src/base/hash_tables.h index 956cadb3d..9e8d6b110 100644 --- a/ipc/chromium/src/base/hash_tables.h +++ b/ipc/chromium/src/base/hash_tables.h @@ -31,18 +31,14 @@ #ifdef __GNUC__ # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wshadow" -# if MOZ_GCC_VERSION_AT_LEAST(4, 9, 0) -# pragma GCC diagnostic ignored "-Wshadow-local" -# endif +# pragma GCC diagnostic ignored "-Wshadow-local" #endif #include <hash_map> #include <hash_set> #ifdef __GNUC__ -# if MOZ_GCC_VERSION_AT_LEAST(4, 9, 0) -# pragma GCC diagnostic pop // -Wshadow-local -# endif +# pragma GCC diagnostic pop // -Wshadow-local # pragma GCC diagnostic pop // -Wshadow #endif diff --git a/layout/style/nsCSSPseudoElements.h b/layout/style/nsCSSPseudoElements.h index eaf8d966b..acf818a2c 100644 --- a/layout/style/nsCSSPseudoElements.h +++ b/layout/style/nsCSSPseudoElements.h @@ -111,7 +111,7 @@ private: // which is a general gcc bug that we seem to have hit only on Android/x86. #if defined(ANDROID) && defined(__i386__) && defined(__GNUC__) && \ !defined(__clang__) -#if (MOZ_GCC_VERSION_AT_LEAST(4,9,0) && MOZ_GCC_VERSION_AT_MOST(4,9,2)) +#if (MOZ_GCC_VERSION_AT_MOST(4,9,2)) __attribute__((noinline)) #endif #endif |