diff options
| author | Richard Levitte <levitte@openssl.org> | 2001-02-20 08:13:47 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2001-02-20 08:13:47 +0000 |
| commit | bc36ee6227517edae802bcb0da68d4f04fe1fb5e (patch) | |
| tree | 19782c56cd5f5930807df5c8bfb4963a05121c48 /crypto/cryptlib.c | |
| parent | f2bc668429fa2abdc77db0db861a9bb2be0c3a85 (diff) | |
| download | openssl-bc36ee6227517edae802bcb0da68d4f04fe1fb5e.tar.gz | |
Use new-style system-id macros everywhere possible. I hope I haven't
missed any.
This compiles and runs on Linux, and external applications have no
problems with it. The definite test will be to build this on VMS.
Diffstat (limited to 'crypto/cryptlib.c')
| -rw-r--r-- | crypto/cryptlib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 8634c078d8..11ac630c22 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -62,7 +62,7 @@ #include <openssl/crypto.h> #include <openssl/safestack.h> -#if defined(WIN32) || defined(WIN16) +#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) static double SSLeay_MSVC5_hack=0.0; /* and for VC1.5 */ #endif @@ -133,7 +133,7 @@ int CRYPTO_get_new_lockid(char *name) char *str; int i; -#if defined(WIN32) || defined(WIN16) +#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) /* A hack to make Visual C++ 5.0 work correctly when linking as * a DLL using /MT. Without this, the application cannot use * and floating point printf's. @@ -354,9 +354,9 @@ unsigned long CRYPTO_thread_id(void) if (id_callback == NULL) { -#ifdef WIN16 +#ifdef OPENSSL_SYS_WIN16 ret=(unsigned long)GetCurrentTask(); -#elif defined(WIN32) +#elif defined(OPENSSL_SYS_WIN32) ret=(unsigned long)GetCurrentThreadId(); #elif defined(GETPID_IS_MEANINGLESS) ret=1L; @@ -464,7 +464,7 @@ const char *CRYPTO_get_lock_name(int type) } #ifdef _DLL -#ifdef WIN32 +#ifdef OPENSSL_SYS_WIN32 /* All we really need to do is remove the 'error' state when a thread * detaches */ |