From b2514d49d2cc808dbfc261442ecdcf791c2f4091 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Wed, 13 Apr 2022 20:11:36 +1000 Subject: [PATCH] 3rdparty/wx: Fix compilation in MSVC conformance mode --- 3rdparty/wxwidgets3.0/include/wx/wxcrt.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/3rdparty/wxwidgets3.0/include/wx/wxcrt.h b/3rdparty/wxwidgets3.0/include/wx/wxcrt.h index dd579364fa..1abac71e7e 100644 --- a/3rdparty/wxwidgets3.0/include/wx/wxcrt.h +++ b/3rdparty/wxwidgets3.0/include/wx/wxcrt.h @@ -466,7 +466,8 @@ WX_STRCMP_FUNC(wxStricmp, wxCRT_StricmpA, wxCRT_StricmpW, wxStricmp_String) // forward-declare the template and implement it below WX_STRCMP_FUNC. OTOH, // this fails to compile with VC6, so don't do it for VC. It also causes // problems with GCC visibility in newer GCC versions. -#if !(defined(__VISUALC__) || (wxCHECK_GCC_VERSION(3,5) && !wxCHECK_GCC_VERSION(4,7))) || defined(__clang__) +// PCSX2: MSVC in conformance mode also requires declaration before use. +#if (wxCHECK_GCC_VERSION(3,5) && !wxCHECK_GCC_VERSION(4,7)) || defined(__clang__) || defined(__VISUALC__) #define wxNEEDS_DECL_BEFORE_TEMPLATE #endif