diff options
author | Moonchild <moonchild@palemoon.org> | 2021-02-25 01:03:57 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2021-02-25 01:03:57 +0000 |
commit | ceadffab6b357723981a429e11222daf6cd6dcfb (patch) | |
tree | 5603053048d6a460f79b22bdf165fb74d32d39b0 /config/gcc-stl-wrapper.template.h | |
parent | 14fb2f966e9b54598c451e3cb35b4aa0480dafed (diff) | |
parent | ad5a13bd501e379517da1a944c104a11d951a3f5 (diff) | |
download | UXP-RC_20210225.tar UXP-RC_20210225.tar.gz UXP-RC_20210225.tar.lz UXP-RC_20210225.tar.xz UXP-RC_20210225.zip |
Merge branch 'master' into releaseRC_20210225
Diffstat (limited to 'config/gcc-stl-wrapper.template.h')
-rw-r--r-- | config/gcc-stl-wrapper.template.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h index 9b4a61d24..e7b01482c 100644 --- a/config/gcc-stl-wrapper.template.h +++ b/config/gcc-stl-wrapper.template.h @@ -32,6 +32,14 @@ # define moz_dont_include_mozalloc_for_cstdlib #endif +#ifndef moz_dont_include_mozalloc_for_type_traits +# define moz_dont_include_mozalloc_for_type_traits +#endif + +#ifndef moz_dont_include_mozalloc_for_limits +# define moz_dont_include_mozalloc_for_limits +#endif + // Include mozalloc after the STL header and all other headers it includes // have been preprocessed. #if !defined(MOZ_INCLUDE_MOZALLOC_H) && \ |