From b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9 Mon Sep 17 00:00:00 2001 From: beck <> Date: Wed, 15 May 2002 02:29:21 +0000 Subject: OpenSSL 0.9.7 stable 2002 05 08 merge --- src/lib/libcrypto/threads/mttest.c | 8 ++++---- src/lib/libcrypto/threads/th-lock.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/lib/libcrypto/threads') diff --git a/src/lib/libcrypto/threads/mttest.c b/src/lib/libcrypto/threads/mttest.c index 019add4d9c..c474a63c74 100644 --- a/src/lib/libcrypto/threads/mttest.c +++ b/src/lib/libcrypto/threads/mttest.c @@ -63,7 +63,7 @@ #ifdef LINUX #include #endif -#ifdef WIN32 +#ifdef OPENSSL_SYS_WIN32 #include #endif #ifdef SOLARIS @@ -86,7 +86,7 @@ #include #include -#ifdef NO_FP_API +#ifdef OPENSSL_NO_FP_API #define APPS_WIN16 #include "../buffer/bss_file.c" #endif @@ -692,7 +692,7 @@ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx) #define THREAD_STACK_SIZE (16*1024) -#ifdef WIN32 +#ifdef OPENSSL_SYS_WIN32 static HANDLE *lock_cs; @@ -783,7 +783,7 @@ void do_threads(SSL_CTX *s_ctx, SSL_CTX *c_ctx) printf("win32 threads done - %.3f seconds\n",ret); } -#endif /* WIN32 */ +#endif /* OPENSSL_SYS_WIN32 */ #ifdef SOLARIS diff --git a/src/lib/libcrypto/threads/th-lock.c b/src/lib/libcrypto/threads/th-lock.c index 553d2218de..a6a79b9f45 100644 --- a/src/lib/libcrypto/threads/th-lock.c +++ b/src/lib/libcrypto/threads/th-lock.c @@ -63,7 +63,7 @@ #ifdef LINUX #include #endif -#ifdef WIN32 +#ifdef OPENSSL_SYS_WIN32 #include #endif #ifdef SOLARIS @@ -105,7 +105,7 @@ static unsigned long pthreads_thread_id(void ); #define THREAD_STACK_SIZE (16*1024) -#ifdef WIN32 +#ifdef OPENSSL_SYS_WIN32 static HANDLE *lock_cs; @@ -146,7 +146,7 @@ void win32_locking_callback(int mode, int type, char *file, int line) } } -#endif /* WIN32 */ +#endif /* OPENSSL_SYS_WIN32 */ #ifdef SOLARIS -- cgit v1.2.3-55-g6feb