[openssl] master update

tomas at openssl.org tomas at openssl.org
Thu Sep 23 12:07:31 UTC 2021

The branch master has been updated
       via  eeb612021e220de734e1ff08499f42bb962c3916 (commit)
      from  415e6ac80405e13b20b083315747e431274fbd33 (commit)

- Log -----------------------------------------------------------------
commit eeb612021e220de734e1ff08499f42bb962c3916
Author: Kelvin Lee <kiyolee at gmail.com>
Date:   Tue Sep 14 17:55:50 2021 +1000

    Explicitly #include <synchapi.h> is unnecessary
    The header is already included by <windows.h> for WinSDK 8 or later.
    Actually this causes problem for WinSDK 7.1 (defaults for VS2010) that
    it does not have this header while SRW Locks do exist for Windows 7.
    CLA: trivial
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16603)


Summary of changes:
 crypto/threads_win.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index fdc32a2a54..d65b3826d9 100644
--- a/crypto/threads_win.c
+++ b/crypto/threads_win.c
@@ -10,7 +10,6 @@
 #if defined(_WIN32)
 # include <windows.h>
 # if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600
-#  include <synchapi.h>
 #  define USE_RWLOCK
 # endif

More information about the openssl-commits mailing list