Globally define WIN32_LEAN_AND_MEAN (#882)

diff --git a/cmake/StandardSettings.cmake b/cmake/StandardSettings.cmake
index 8742be0bb8b22aa2009fd77648ccdc40c6fb05e4..4dfc7e1d35ef0d53d96e4b0ebd8e4895ceeeb647 100644 (file)
--- 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 be82343081ad4301cdbbcbff52e69eff26aa8e52..191f5e30ad31e235e6f0421a58d29ca3131663ed 100644 (file)
--- 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 8963b89061e7ca3e4212bfbfe30b2acfa098420a..d0bea77652081a29a14fbcc4e03f240133627115 100644 (file)
--- 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>