From 341fffd5b7e4f0f8c02c6d94c746eb3acdf8dff4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 28 Oct 2013 20:38:59 +0000 Subject: [PATCH] Don't define _CRTBLD when using MSVC 12 or later. This results in fatal #errors from the standard which doesn't want to be included with _CRTBLD defined. Generally speaking, defining _CRTBLD looks like a very wrong thing to do and it's probably not necessary any more (considering that it was done in r25683 almost 10 years ago) but only avoid doing this with VC 12 for now to avoid breaking anything else before 3.0. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/msvcrt.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/wx/msw/msvcrt.h b/include/wx/msw/msvcrt.h index 692f19ef35..e92a88d841 100644 --- a/include/wx/msw/msvcrt.h +++ b/include/wx/msw/msvcrt.h @@ -37,7 +37,12 @@ #endif #include - #ifndef _CRTBLD + + // Defining _CRTBLD should never be necessary at all, but keep it for now + // as there is no time to retest all the compilers before 3.0 release. + // Definitely do not use it with MSVS 2013 as defining it results in errors + // if the standard is included afterwards. + #if !defined(_CRTBLD) && !wxCHECK_VISUALC_VERSION(12) // Needed when building with pure MS SDK #define _CRTBLD #endif