The branch OpenSSL_1_1_1-stable has been updated via a44e1b2f20e4ac5e2ac11b63e1ae935981ea9428 (commit) via c3656cc594daac8167721dde7220f0e59ae146fc (commit) from 5c184ff280ee042e3b7e07701b61adbcbe2958d7 (commit)
- Log ----------------------------------------------------------------- commit a44e1b2f20e4ac5e2ac11b63e1ae935981ea9428 Author: Dr. Matthias St. Pierre <matthias.st.pie...@ncp-e.com> Date: Wed Sep 11 10:40:18 2019 +0200 crypto/threads_win.c: fix preprocessor indentation Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9860) commit c3656cc594daac8167721dde7220f0e59ae146fc Author: Dr. Matthias St. Pierre <matthias.st.pie...@ncp-e.com> Date: Wed Sep 11 10:25:43 2019 +0200 crypto/threads_none.c: fix syntax error in openssl_get_fork_id() Fixes #9858 Reviewed-by: Matt Caswell <m...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9860) ----------------------------------------------------------------------- Summary of changes: crypto/threads_none.c | 2 +- crypto/threads_win.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/threads_none.c b/crypto/threads_none.c index aabf0e0dc0..aaaaae872a 100644 --- a/crypto/threads_none.c +++ b/crypto/threads_none.c @@ -143,7 +143,7 @@ int openssl_get_fork_id(void) # if defined(OPENSSL_SYS_UNIX) return getpid(); # else - return return 0; + return 0; # endif } #endif diff --git a/crypto/threads_win.c b/crypto/threads_win.c index 44a360fcab..ba25d2719a 100644 --- a/crypto/threads_win.c +++ b/crypto/threads_win.c @@ -24,15 +24,15 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void) return NULL; } -#if !defined(_WIN32_WCE) +# if !defined(_WIN32_WCE) /* 0x400 is the spin count value suggested in the documentation */ if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) { OPENSSL_free(lock); return NULL; } -#else +# else InitializeCriticalSection(lock); -#endif +# endif return lock; }