summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortrav90 <travawine@openmailbox.org>2018-02-04 12:31:30 -0600
committertrav90 <travawine@openmailbox.org>2018-02-04 12:31:30 -0600
commit65c311a7ef443b953c4f618afc6b81578a5dea3b (patch)
tree77b44a2c440e9262e26ea626c07d4f8815b3fc74
parent048149389cd9d216bd36a2ecde2076312c265c9e (diff)
downloadUXP-65c311a7ef443b953c4f618afc6b81578a5dea3b.tar
UXP-65c311a7ef443b953c4f618afc6b81578a5dea3b.tar.gz
UXP-65c311a7ef443b953c4f618afc6b81578a5dea3b.tar.lz
UXP-65c311a7ef443b953c4f618afc6b81578a5dea3b.tar.xz
UXP-65c311a7ef443b953c4f618afc6b81578a5dea3b.zip
Remove checks for GCC < 4.9
-rw-r--r--layout/style/nsCSSPseudoElements.h3
-rw-r--r--mfbt/Attributes.h4
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 */