From 0e870c540687df6bbb45a536a1bc7724ff7b7c5a Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Sat, 22 May 2021 10:29:00 +0200 Subject: [PATCH] Don't define DllMain in static builds --- src/libsodium/sodium/core.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/libsodium/sodium/core.c b/src/libsodium/sodium/core.c index 107d20c1..3ad2d1b2 100644 --- a/src/libsodium/sodium/core.c +++ b/src/libsodium/sodium/core.c @@ -215,14 +215,13 @@ sodium_set_misuse_handler(void (*handler)(void)) return 0; } -#ifdef _WIN32 +#if defined(_WIN32) && !defined(SODIUM_STATIC) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved) { - switch (fdwReason) { - case DLL_PROCESS_DETACH: - if (_sodium_lock_initialized == 2) { - DeleteCriticalSection(&_sodium_lock); - } - break; + (void) hinstDLL; + (void) lpReserved; + + if (fdwReason == DLL_PROCESS_DETACH && _sodium_lock_initialized == 2) { + DeleteCriticalSection(&_sodium_lock); } return TRUE; }