firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 00:03:02 +01:00
Code Issues

This should show value of _MSC_VER when build fails with new version of MSVC.

Browse Source 
Note, it is not documented so far for newly released  MSVC 17.1.
This commit is contained in:
Vlad Khorsun 2022-02-22 12:13:21 +02:00
parent 2d6f2def9e
commit 913d17ae35
1 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/common/os/win32/mod_loader.cpp
View File

@ -87,26 +87,34 @@ public:
memset(&ackd, 0, sizeof(ackd)); memset(&ackd, 0, sizeof(ackd));
ackd.cbSize = sizeof(ackd); ackd.cbSize = sizeof(ackd);
const char* crtDll =
#if _MSC_VER == 1400
"msvcr80.dll";
#elif _MSC_VER == 1500
"msvcr90.dll";
#elif _MSC_VER == 1600
"msvcr100.dll";
#elif _MSC_VER == 1700
"msvcr110.dll";
#elif _MSC_VER == 1800
"msvcr120.dll";
#elif _MSC_VER >= 1900 && _MSC_VER <= 1930
"vcruntime140.dll";
#else
"";
#define TO_STR(x) #x
#define ERRSTR(x) "Unknown " #x " value: " TO_STR(x) ". Specify CRT DLL name here !"
static_assert(false, ERRSTR(_MSC_VER));
// #error Specify CRT DLL name here !
#endif
// if CRT already present in some activation context then nothing to do // if CRT already present in some activation context then nothing to do
if ((*mFindActCtxSectionString) if ((*mFindActCtxSectionString)
(0, NULL, (0, NULL,
ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION,
#if _MSC_VER == 1400 crtDll, &ackd))
"msvcr80.dll",
#elif _MSC_VER == 1500
"msvcr90.dll",
#elif _MSC_VER == 1600
"msvcr100.dll",
#elif _MSC_VER == 1700
"msvcr110.dll",
#elif _MSC_VER == 1800
"msvcr120.dll",
#elif _MSC_VER >= 1900 && _MSC_VER <= 1930
"vcruntime140.dll",
#else
#error Specify CRT DLL name here !
#endif
&ackd))
{ {
return; return;
} }