From 6022fe81a24883320d0b78679e2cf1ebed11e83e Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 4 May 2009 06:23:05 +0000 Subject: [PATCH] cryptlib.c: refine logic in OpenSSLDie (addenum to commit#18118). --- crypto/cryptlib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 901b87a4dd..ed27d66099 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -711,6 +711,8 @@ void OPENSSL_cpuid_setup(void) {} #ifdef __CYGWIN__ /* pick DLL_[PROCESS|THREAD]_[ATTACH|DETACH] definitions */ #include +/* this has side-effect of _WIN32 getting defined, which otherwise + * is mutually exclusive with __CYGWIN__... */ #endif /* All we really need to do is remove the 'error' state when a thread @@ -884,10 +886,10 @@ void OpenSSLDie(const char *file,int line,const char *assertion) OPENSSL_showfatal( "%s(%d): OpenSSL internal error, assertion failed: %s\n", file,line,assertion); -#if !defined(_WIN32) +#if !defined(_WIN32) || defined(__CYGWIN__) abort(); #else - /* Win32 customarily shows a dialog, but we just did that... */ + /* Win32 abort() customarily shows a dialog, but we just did that... */ raise(SIGABRT); _exit(3); #endif -- 2.34.1