From 425ed0ffe0880f2c63344c0861ddf37b346b9738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20T=2E=20Listwon?= <blistwon@gmail.com>
Date: Thu, 23 Sep 2021 08:56:12 +0200
Subject: Add missing WIN32_LEAN_AND_MEAN

---
 drivers/unix/ip_unix.cpp                | 4 ++--
 drivers/wasapi/audio_driver_wasapi.h    | 1 +
 drivers/windows/dir_access_windows.cpp  | 1 +
 drivers/windows/file_access_windows.cpp | 1 +
 drivers/winmidi/midi_driver_winmidi.h   | 1 +
 drivers/xaudio2/audio_driver_xaudio2.h  | 1 +
 6 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'drivers')

diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp
index 8a880ab9c8..d32592e81a 100644
--- a/drivers/unix/ip_unix.cpp
+++ b/drivers/unix/ip_unix.cpp
@@ -36,9 +36,9 @@
 
 #ifdef WINDOWS_ENABLED
 #include <stdio.h>
-#include <winsock2.h>
-// Needs to be included after winsocks2.h
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#include <winsock2.h>
 #include <ws2tcpip.h>
 #ifndef UWP_ENABLED
 #include <iphlpapi.h>
diff --git a/drivers/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h
index 312b6a6781..a19cd3da09 100644
--- a/drivers/wasapi/audio_driver_wasapi.h
+++ b/drivers/wasapi/audio_driver_wasapi.h
@@ -39,6 +39,7 @@
 
 #include <audioclient.h>
 #include <mmdeviceapi.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 class AudioDriverWASAPI : public AudioDriver {
diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp
index f7a5f7279e..afaa3864cd 100644
--- a/drivers/windows/dir_access_windows.cpp
+++ b/drivers/windows/dir_access_windows.cpp
@@ -37,6 +37,7 @@
 
 #include <stdio.h>
 #include <wchar.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 /*
diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp
index 775c999b15..035c44a28c 100644
--- a/drivers/windows/file_access_windows.cpp
+++ b/drivers/windows/file_access_windows.cpp
@@ -37,6 +37,7 @@
 
 #include <share.h> // _SH_DENYNO
 #include <shlwapi.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #include <errno.h>
diff --git a/drivers/winmidi/midi_driver_winmidi.h b/drivers/winmidi/midi_driver_winmidi.h
index bb9a87d610..2f691489b3 100644
--- a/drivers/winmidi/midi_driver_winmidi.h
+++ b/drivers/winmidi/midi_driver_winmidi.h
@@ -37,6 +37,7 @@
 #include "core/templates/vector.h"
 
 #include <stdio.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #include <mmsystem.h>
diff --git a/drivers/xaudio2/audio_driver_xaudio2.h b/drivers/xaudio2/audio_driver_xaudio2.h
index d3938a19d0..c1910d3f5d 100644
--- a/drivers/xaudio2/audio_driver_xaudio2.h
+++ b/drivers/xaudio2/audio_driver_xaudio2.h
@@ -36,6 +36,7 @@
 #include "servers/audio_server.h"
 
 #include <mmsystem.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <wrl/client.h>
 #include <xaudio2.h>
-- 
cgit v1.2.3