From 00555c2f2fa65701b40402f4bf47fc450bd5523d Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 1 Aug 2004 14:27:43 +0000 Subject: DLLEntryPoint is a collective name, not what linker looks for. However, if we explicitly intruct the linker to set entry point, then we become obliged to initialize run-time library. Instead we can pick name run-time will call and such name is DllMain. Note that this applies to both "native" Win32 environment and Cygwin:-) --- crypto/cryptlib.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'crypto/cryptlib.c') diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 23264ec823..e0380a38f4 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -571,13 +571,12 @@ void OPENSSL_cpuid_setup() void OPENSSL_cpuid_setup() {} #endif -#ifdef _DLL -#ifdef OPENSSL_SYS_WIN32 +#if (defined(_WIN32) || defined(__CYGWIN__)) && defined(_DLL) /* All we really need to do is remove the 'error' state when a thread * detaches */ -BOOL WINAPI DLLEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { switch(fdwReason) @@ -597,8 +596,6 @@ BOOL WINAPI DLLEntryPoint(HINSTANCE hinstDLL, DWORD fdwReason, } #endif -#endif - void OpenSSLDie(const char *file,int line,const char *assertion) { fprintf(stderr, -- cgit v1.2.3