[tor-commits] [tor-browser/tor-browser-45.5.0esr-6.5-1] Revert "Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj"

[gk at torproject.org]

commit 0034dc744640ae3977ad2087a19224c5fa0ee13f
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Nov 10 21:34:37 2016 +0000

    Revert "Bug 1245076 - Don't include mozalloc.h from the cstdlib wrapper. r=froydnj"
    
    This reverts commit b26ae5164dd21e82ed924f0338c740f92d99d71c.
    
    Was needed for GCC 6.2.0 which we don't use.
---
 config/gcc-stl-wrapper.template.h | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/config/gcc-stl-wrapper.template.h b/config/gcc-stl-wrapper.template.h
index b5ebeec..75bbe75 100644
--- a/config/gcc-stl-wrapper.template.h
+++ b/config/gcc-stl-wrapper.template.h
@@ -17,11 +17,6 @@
 // Silence "warning: #include_next is a GCC extension"
 #pragma GCC system_header
 
-// Don't include mozalloc for cstdlib. See bug 1245076.
-#ifndef moz_dont_include_mozalloc_for_cstdlib
-#  define moz_dont_include_mozalloc_for_cstdlib
-#endif
-#ifndef moz_dont_include_mozalloc_for_${HEADER}
 // mozalloc.h wants <new>; break the cycle by always explicitly
 // including <new> here.  NB: this is a tad sneaky.  Sez the gcc docs:
 //
@@ -30,17 +25,15 @@
 //    same name as the current file. It simply looks for the file
 //    named, starting with the directory in the search path after the
 //    one where the current file was found.
-#  include_next <new>
+#include_next <new>
 
 // See if we're in code that can use mozalloc.  NB: this duplicates
 // code in nscore.h because nscore.h pulls in prtypes.h, and chromium
 // can't build with that being included before base/basictypes.h.
-#  if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
-#    include "mozilla/mozalloc.h"
-#  else
-#    error "STL code can only be used with infallible ::operator new()"
-#  endif
-
+#if !defined(XPCOM_GLUE) && !defined(NS_NO_XPCOM) && !defined(MOZ_NO_MOZALLOC)
+#  include "mozilla/mozalloc.h"
+#else
+#  error "STL code can only be used with infallible ::operator new()"
 #endif
 
 #if defined(DEBUG) && !defined(_GLIBCXX_DEBUG)