diff options
| -rw-r--r-- | layout/style/nsCSSPseudoElements.h | 3 | ||||
| -rw-r--r-- | mfbt/Attributes.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/layout/style/nsCSSPseudoElements.h b/layout/style/nsCSSPseudoElements.h index 657ef663e..eaf8d966b 100644 --- a/layout/style/nsCSSPseudoElements.h +++ b/layout/style/nsCSSPseudoElements.h @@ -111,8 +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,8,0) && MOZ_GCC_VERSION_AT_MOST(4,8,4)) || \ - (MOZ_GCC_VERSION_AT_LEAST(4,9,0) && MOZ_GCC_VERSION_AT_MOST(4,9,2)) +#if (MOZ_GCC_VERSION_AT_LEAST(4,9,0) && MOZ_GCC_VERSION_AT_MOST(4,9,2)) __attribute__((noinline)) #endif #endif diff --git a/mfbt/Attributes.h b/mfbt/Attributes.h index df6172f31..c875e3a8c 100644 --- a/mfbt/Attributes.h +++ b/mfbt/Attributes.h @@ -562,9 +562,7 @@ # define MOZ_HAVE_REF_QUALIFIERS #elif defined(__GNUC__) # include "mozilla/Compiler.h" -# if MOZ_GCC_VERSION_AT_LEAST(4, 8, 1) -# define MOZ_HAVE_REF_QUALIFIERS -# endif +# define MOZ_HAVE_REF_QUALIFIERS #endif #endif /* __cplusplus */ |