diff options
| author | Andy Polyakov <appro@openssl.org> | 2009-05-04 08:23:05 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2009-05-04 08:23:05 +0200 |
| commit | 6022fe81a24883320d0b78679e2cf1ebed11e83e (patch) | |
| tree | 58f218297410751ea2ad2b7f41c793110ad7a265 /crypto/cryptlib.c | |
| parent | libeay.num: add ENGINE_load_aesni. (diff) | |
| download | openssl-6022fe81a24883320d0b78679e2cf1ebed11e83e.tar.xz openssl-6022fe81a24883320d0b78679e2cf1ebed11e83e.zip | |
cryptlib.c: refine logic in OpenSSLDie (addenum to commit#18118).
Diffstat (limited to 'crypto/cryptlib.c')
| -rw-r--r-- | crypto/cryptlib.c | 6 |
1 files 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 <windows.h> +/* 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 |