From: Vadim Zeitlin Date: Thu, 1 Mar 2012 01:05:25 +0000 (+0000) Subject: Correct wxCOMPILER_PREFIX definition when wxMSVC_VERSION is predefined. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2c8c1de1ee8181aee1bf6d74c0d7cf0b7bb42151 Correct wxCOMPILER_PREFIX definition when wxMSVC_VERSION is predefined. Fix the wrong concatenation macro name that was used as using wxMSVC_VERSION could not work as expected before (which also shows that nobody ever used it). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/msvc/wx/setup.h b/include/msvc/wx/setup.h index 096bdb0abc..799914175f 100644 --- a/include/msvc/wx/setup.h +++ b/include/msvc/wx/setup.h @@ -46,7 +46,7 @@ // wxMSVC_VERSION as "XX" or define wxMSVC_VERSION_AUTO to use the appropriate // version depending on the compiler used #ifdef wxMSVC_VERSION - #define wxCOMPILER_PREFIX wxCONCAT2(vc, wxMSVC_VERSION) + #define wxCOMPILER_PREFIX wxCONCAT(vc, wxMSVC_VERSION) #elif defined(wxMSVC_VERSION_AUTO) #if _MSC_VER == 1200 #define wxCOMPILER_PREFIX vc60