ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-02 00:54:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx-windows: define the dll's entry point only depending on the MDBX_AVOID_CRT option.

Browse Source
This commit is contained in:
Leonid Yuriev 2019-09-05 01:38:05 +03:00
parent 1829a2a5c1
commit 0667f4f211
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/elements/lck-windows.c
View File

@ -27,16 +27,13 @@
static void mdbx_winnt_import(void); static void mdbx_winnt_import(void);
#ifdef MDBX_BUILD_DLL #ifdef MDBX_BUILD_DLL
#if MDBX_AVOID_CRT && defined(NDEBUG)
/* DEBUG/CHECKED builds still require MSVC's CRT for runtime checks. /* DEBUG/CHECKED builds still require MSVC's CRT for runtime checks.
* *
* Therefore we don't define dll's entry point for debug/checked builds by MSVC. * Define dll's entry point only for Release build when NDEBUG is defined and
* In this case MSVC's will automatically use DllMainCRTStartup() from CRT * MDBX_AVOID_CRT=ON. if the entry point isn't defined then MSVC's will
* library, which also automatically call DllMain() from our mdbx.dll * automatically use DllMainCRTStartup() from CRT library, which also
* * automatically call DllMain() from our mdbx.dll */
* On the other side, for RELEASE builds
* we explicitly define DllMain() as the entry point and don't linking with
* any CRT libraries (IgnoreAllDefaultLibraries = Yes). */
#if !defined(_MSC_VER) || defined(NDEBUG)
#pragma comment(linker, "/ENTRY:DllMain") #pragma comment(linker, "/ENTRY:DllMain")
#endif #endif
@ -734,7 +731,6 @@ static void mdbx_winnt_import(void) {
#define GET_KERNEL32_PROC(ENTRY) \ #define GET_KERNEL32_PROC(ENTRY) \
mdbx_##ENTRY = (MDBX_##ENTRY)GetProcAddress(hKernel32dll, #ENTRY) mdbx_##ENTRY = (MDBX_##ENTRY)GetProcAddress(hKernel32dll, #ENTRY)
GET_KERNEL32_PROC(GetFileInformationByHandleEx); GET_KERNEL32_PROC(GetFileInformationByHandleEx);
GET_KERNEL32_PROC(GetVolumeInformationByHandleW); GET_KERNEL32_PROC(GetVolumeInformationByHandleW);
GET_KERNEL32_PROC(GetFinalPathNameByHandleW); GET_KERNEL32_PROC(GetFinalPathNameByHandleW);
@ -743,6 +739,7 @@ static void mdbx_winnt_import(void) {
GET_KERNEL32_PROC(DiscardVirtualMemory); GET_KERNEL32_PROC(DiscardVirtualMemory);
if (!mdbx_DiscardVirtualMemory) if (!mdbx_DiscardVirtualMemory)
mdbx_DiscardVirtualMemory = stub_DiscardVirtualMemory; mdbx_DiscardVirtualMemory = stub_DiscardVirtualMemory;
#undef GET_KERNEL32_PROC
const HINSTANCE hNtdll = GetModuleHandleA("ntdll.dll"); const HINSTANCE hNtdll = GetModuleHandleA("ntdll.dll");
mdbx_NtFsControlFile = mdbx_NtFsControlFile =