From 7069f600b4fd513f78b975508cc6c5799d9a8bb7 Mon Sep 17 00:00:00 2001 From: Nicholas <75703478+ClassicNick@users.noreply.github.com> Date: Thu, 3 Apr 2025 17:51:27 -0300 Subject: [PATCH 1/3] Update msvc_raise_wrappers.h In memory/mozalloc --- memory/mozalloc/msvc_raise_wrappers.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/memory/mozalloc/msvc_raise_wrappers.h b/memory/mozalloc/msvc_raise_wrappers.h index 91b77f453b..4e58c9ad6b 100644 --- a/memory/mozalloc/msvc_raise_wrappers.h +++ b/memory/mozalloc/msvc_raise_wrappers.h @@ -8,12 +8,14 @@ #ifndef mozilla_msvc_raise_wrappers_h #define mozilla_msvc_raise_wrappers_h +#if defined (_MSC_VER) && _MSC_VER <= 1800 #ifdef _XSTDDEF_ # error "Unable to wrap _RAISE(); CRT _RAISE() already defined" #endif #ifdef _XUTILITY_ # error "Unable to wrap _X[exception](); CRT versions already declared" #endif +#endif #ifdef _FUNCTIONAL_ # error "Unable to wrap _Xbad_function_call(); CRT version already declared" #endif @@ -24,11 +26,13 @@ // We #define them to be named differently so we can ensure the exception // throwing semantics of these functions work exactly the way we want, by // defining our own versions in msvc_raise_wrappers.cpp. +#if defined (_MSC_VER) && _MSC_VER <= 1800 # define _Xinvalid_argument moz_Xinvalid_argument # define _Xlength_error moz_Xlength_error # define _Xout_of_range moz_Xout_of_range # define _Xoverflow_error moz_Xoverflow_error # define _Xruntime_error moz_Xruntime_error +#endif // used by # define _Xbad_function_call moz_Xbad_function_call 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 2/3] 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 From b479cbba51fb4c15c6505ab0816748e5f6ed7e8e Mon Sep 17 00:00:00 2001 From: Nicholas <75703478+ClassicNick@users.noreply.github.com> Date: Thu, 3 Apr 2025 17:56:18 -0300 Subject: [PATCH 3/3] Replace "wwc" with static_cast --- toolkit/xre/nsNativeAppSupportWin.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolkit/xre/nsNativeAppSupportWin.cpp b/toolkit/xre/nsNativeAppSupportWin.cpp index 4319bd1679..622fa58a7d 100644 --- a/toolkit/xre/nsNativeAppSupportWin.cpp +++ b/toolkit/xre/nsNativeAppSupportWin.cpp @@ -505,7 +505,7 @@ struct MessageWindow { ::_snwprintf(classNameBuffer, 128, // size of classNameBuffer in PRUnichars L"%s%s", - wwc(NS_ConvertUTF8toUTF16(gAppData->remotingName).get()), + static_cast(NS_ConvertUTF8toUTF16(gAppData->remotingName).get()), L"MessageWindow" ); mClassName = classNameBuffer; } @@ -668,7 +668,7 @@ nsNativeAppSupportWin::Start( bool *aResult ) { ::_snwprintf(reinterpret_cast(mMutexName), sizeof mMutexName / sizeof(char16_t), L"%s%s%s", MOZ_MUTEX_NAMESPACE, - wwc(NS_ConvertUTF8toUTF16(gAppData->name).get()), + static_cast(NS_ConvertUTF8toUTF16(gAppData->name).get()), MOZ_STARTUP_MUTEX_NAME ); Win32Mutex startupLock = Win32Mutex( mMutexName );