summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2022-04-18 15:44:50 +0000
committerMoonchild <moonchild@palemoon.org>2022-04-18 15:44:50 +0000
commit2e34db5696aa45e055348b1547179a0d476bca75 (patch)
tree8c77a2cedcdd173741b306f32a620a2b958dd6c4
parent145947d86b7d8072b4b12a955e642e21873dd212 (diff)
parent077b053ba4270d213b0476d8d27dc8ec9a5da3e7 (diff)
downloaduxp-2e34db5696aa45e055348b1547179a0d476bca75.tar.gz
Merge pull request 'Bump minimum required GCC version in mfbt' (#1872) from trav90/UXP-contrib:compiler-hacks-cleanup into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/1872
-rw-r--r--mfbt/Compiler.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/mfbt/Compiler.h b/mfbt/Compiler.h
index 6478176e19..c97ce261ac 100644
--- a/mfbt/Compiler.h
+++ b/mfbt/Compiler.h
@@ -17,7 +17,7 @@
# define MOZ_IS_GCC 1
/*
* These macros should simplify gcc version checking. For example, to check
- * for gcc 4.7.1 or later, check `#if MOZ_GCC_VERSION_AT_LEAST(4, 7, 1)`.
+ * for gcc 7.1.0 or later, check `#if MOZ_GCC_VERSION_AT_LEAST(7, 1, 0)`.
*/
# define MOZ_GCC_VERSION_AT_LEAST(major, minor, patchlevel) \
((__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) \
@@ -25,8 +25,8 @@
# define MOZ_GCC_VERSION_AT_MOST(major, minor, patchlevel) \
((__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) \
<= ((major) * 10000 + (minor) * 100 + (patchlevel)))
-# if !MOZ_GCC_VERSION_AT_LEAST(4, 9, 0)
-# error "mfbt (and Goanna) require at least gcc 4.9 to build."
+# if !MOZ_GCC_VERSION_AT_LEAST(7, 1, 0)
+# error "mfbt (and Goanna) require at least gcc 7.1 to build."
# endif
#elif defined(_MSC_VER)