From 22acac44f1010ff2d27eb50e7b94a537ae06cb61 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 15 Nov 2021 11:34:07 +0100
Subject: [PATCH] Unify Windows.h inclusion

Windows.h must be included first and must be included with care
regarding WinSock.h and WinSock2.h affair.

Signed-off-by: Simon Rozman <simon@rozman.si>
---
 include/wxex/appbar.h | 1 -
 include/wxex/common.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/wxex/appbar.h b/include/wxex/appbar.h
index defc407..f2409d9 100644
--- a/include/wxex/appbar.h
+++ b/include/wxex/appbar.h
@@ -31,7 +31,6 @@
 #include <wx/string.h>
 #pragma warning(pop)
 
-#include <Windows.h>
 #include <Windowsx.h>
 #include <shellapi.h>
 #include <ShlObj.h>
diff --git a/include/wxex/common.h b/include/wxex/common.h
index 1af448c..e7564ae 100644
--- a/include/wxex/common.h
+++ b/include/wxex/common.h
@@ -42,6 +42,7 @@
 
 #if !defined(RC_INVOKED) && !defined(MIDL_PASS)
 
+#define _WINSOCKAPI_    // Prevent inclusion of winsock.h in windows.h.
 #include <Windows.h>
 
 #include <codeanalysis\warnings.h>