blob: d3a87e1080cc506c89d966f2c4d5bb7ded699350 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
$NetBSD: patch-config_gcc-stl-wrapper.template.h,v 1.2 2020/10/07 11:10:34 wiz Exp $
--- config/gcc-stl-wrapper.template.h.orig 2020-04-03 19:34:34.000000000 +0000
+++ config/gcc-stl-wrapper.template.h
@@ -28,8 +28,8 @@
#endif
// Don't include mozalloc for cstdlib. See bug 1245076.
-#ifndef moz_dont_include_mozalloc_for_cstdlib
-# define moz_dont_include_mozalloc_for_cstdlib
+#ifndef moz_dont_include_mozalloc_for_${HEADER}
+# define moz_dont_include_mozalloc_for_${HEADER}
#endif
#ifndef moz_dont_include_mozalloc_for_type_traits
@@ -43,7 +43,7 @@
// Include mozalloc after the STL header and all other headers it includes
// have been preprocessed.
#if !defined(MOZ_INCLUDE_MOZALLOC_H) && \
- !defined(moz_dont_include_mozalloc_for_${HEADER})
+ !defined(moz_dont_include_mozalloc_for_cstdlib)
# define MOZ_INCLUDE_MOZALLOC_H
# define MOZ_INCLUDE_MOZALLOC_H_FROM_${HEADER}
#endif
@@ -72,4 +72,6 @@
# include "mozilla/throw_gcc.h"
#endif
+#undef moz_dont_include_mzalloc_for_${HEADER}
+
#endif // if mozilla_${HEADER}_h
|
