From: Kelvin Lee <kiyolee@gmail.com>
Date: Tue, 14 Sep 2021 07:55:50 +0000 (+1000)
Subject: Explicitly #include <synchapi.h> is unnecessary
X-Git-Tag: openssl-3.2.0-alpha1~3542
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeb612021e220de734e1ff08499f42bb962c3916;p=thirdparty%2Fopenssl.git

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@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16603)
---

diff --git a/crypto/threads_win.c b/crypto/threads_win.c
index fdc32a2a543..d65b3826d93 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
 #endif