diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-04 14:35:31 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-04 14:35:31 -0500 |
| commit | 7edd685eee95759d66a457cf428f42e0dda94671 (patch) | |
| tree | c4514958ea133084552be32d331c115afc509daa /mfbt | |
| parent | 0083d404eff36f873cde465d50cd34b112bd124f (diff) | |
| parent | fc7d9fade54dfbe275c4808dabe30a19415082e0 (diff) | |
| download | UXP-7edd685eee95759d66a457cf428f42e0dda94671.tar UXP-7edd685eee95759d66a457cf428f42e0dda94671.tar.gz UXP-7edd685eee95759d66a457cf428f42e0dda94671.tar.lz UXP-7edd685eee95759d66a457cf428f42e0dda94671.tar.xz UXP-7edd685eee95759d66a457cf428f42e0dda94671.zip | |
Merge branch 'master' into configurebuild-work
Diffstat (limited to 'mfbt')
| -rw-r--r-- | mfbt/Attributes.h | 4 | ||||
| -rw-r--r-- | mfbt/Compiler.h | 4 |
2 files changed, 3 insertions, 5 deletions
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 */ diff --git a/mfbt/Compiler.h b/mfbt/Compiler.h index 1bd34d329..a4fb4b5f8 100644 --- a/mfbt/Compiler.h +++ b/mfbt/Compiler.h @@ -26,8 +26,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, 8, 0) -# error "mfbt (and Gecko) require at least gcc 4.8 to build." +# if !MOZ_GCC_VERSION_AT_LEAST(4, 9, 0) +# error "mfbt (and Goanna) require at least gcc 4.9 to build." # endif #elif defined(_MSC_VER) |