From 85227499569c5ca7052e99e5cf76df4fb37898d2 Mon Sep 17 00:00:00 2001 From: Nicholas <75703478+ClassicNick@users.noreply.github.com> Date: Thu, 3 Apr 2025 17:53:49 -0300 Subject: [PATCH] Update config/msvc-stl-wrapper.template.h --- config/msvc-stl-wrapper.template.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/msvc-stl-wrapper.template.h b/config/msvc-stl-wrapper.template.h index 0a01a6dd1b..2bc2f75e84 100644 --- a/config/msvc-stl-wrapper.template.h +++ b/config/msvc-stl-wrapper.template.h @@ -18,12 +18,15 @@ # include "mozilla/throw_msvc.h" #endif +#if defined (_MSC_VER) && _MSC_VER <= 1800 // Code might include before other wrapped headers, but // includes and so we want to wrap it. But mozalloc.h // wants also, so we break the cycle by always explicitly // including here. #include <${NEW_HEADER_PATH}> +#endif +#if defined (_MSC_VER) && _MSC_VER <= 1800 // 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. @@ -32,6 +35,7 @@ #else # error "STL code can only be used with infallible ::operator new()" #endif +#endif #ifdef _DEBUG // From