From bb340c61d931788e6f97bb9495cff53de6740ec2 Mon Sep 17 00:00:00 2001
From: Gregor Jasny <gregor.jasny@logmein.com>
Date: Mon, 5 Jul 2021 20:20:46 +0200
Subject: [PATCH] Globally define WIN32_LEAN_AND_MEAN (#882)

---
 cmake/StandardSettings.cmake   | 7 +++++++
 src/system.hpp                 | 4 ++++
 src/third_party/win32/mktemp.c | 1 -
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cmake/StandardSettings.cmake b/cmake/StandardSettings.cmake
index 8742be0bb..4dfc7e1d3 100644
--- a/cmake/StandardSettings.cmake
+++ b/cmake/StandardSettings.cmake
@@ -59,3 +59,10 @@ elseif(MSVC)
     INTERFACE /Zc:preprocessor /Zc:__cplusplus /D_CRT_SECURE_NO_WARNINGS
   )
 endif()
+
+if(WIN32)
+  target_compile_definitions(
+    standard_settings
+    INTERFACE WIN32_LEAN_AND_MEAN
+  )
+endif()
diff --git a/src/system.hpp b/src/system.hpp
index be8234308..191f5e30a 100644
--- a/src/system.hpp
+++ b/src/system.hpp
@@ -147,7 +147,11 @@ const mode_t S_IWUSR = mode_t(_S_IWRITE);
 #  include <process.h>
 #  define NOMINMAX 1
 #  define WIN32_NO_STATUS
+// clang-format off
 #  include <windows.h>
+#  include <bcrypt.h> // NTSTATUS
+#  include <winsock2.h> // struct timeval
+// clang-format on
 #  undef WIN32_NO_STATUS
 #  include <ntstatus.h>
 #  define mkdir(a, b) _mkdir(a)
diff --git a/src/third_party/win32/mktemp.c b/src/third_party/win32/mktemp.c
index 8963b8906..d0bea7765 100644
--- a/src/third_party/win32/mktemp.c
+++ b/src/third_party/win32/mktemp.c
@@ -45,7 +45,6 @@
 #include <direct.h>
 #include <io.h>
 
-#define WIN32_LEAN_AND_MEAN
 #define NOMINMAX 1
 #define WIN32_NO_STATUS
 #include <windows.h>
-- 
2.47.3