From 1a8884fcab10f894f39a093a7cf48564ee368722 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 15 Nov 2021 11:50:29 +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>
---
 MSI/MSICA                             | 2 +-
 lib/WinStd                            | 2 +-
 lib/libZRCola/include/zrcola/common.h | 7 ++++---
 lib/wxExtend                          | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/MSI/MSICA b/MSI/MSICA
index f943510..5a67199 160000
--- a/MSI/MSICA
+++ b/MSI/MSICA
@@ -1 +1 @@
-Subproject commit f943510140b067645a42864a99a5e196f64cccc6
+Subproject commit 5a67199179607eb1ae2523440f7b20c5e4c20325
diff --git a/lib/WinStd b/lib/WinStd
index b881647..82935bd 160000
--- a/lib/WinStd
+++ b/lib/WinStd
@@ -1 +1 @@
-Subproject commit b8816476e5f6f4f8465add75ac7bba5c742a2db6
+Subproject commit 82935bd8e0b10f1c29149d2c1639b64392f575cd
diff --git a/lib/libZRCola/include/zrcola/common.h b/lib/libZRCola/include/zrcola/common.h
index 2093cbf..fbf63db 100644
--- a/lib/libZRCola/include/zrcola/common.h
+++ b/lib/libZRCola/include/zrcola/common.h
@@ -19,14 +19,15 @@
 
 #pragma once
 
+#ifdef _WIN32
+#define _WINSOCKAPI_    // Prevent inclusion of winsock.h in windows.h.
+#include <Windows.h>
+#endif
 #include <sal.h>
 #include <istream>
 #include <ostream>
 #include <utility>
 #include <vector>
-#ifdef _WIN32
-#include <Windows.h>
-#endif
 
 
 #pragma warning(push)
diff --git a/lib/wxExtend b/lib/wxExtend
index d9af15c..22acac4 160000
--- a/lib/wxExtend
+++ b/lib/wxExtend
@@ -1 +1 @@
-Subproject commit d9af15c0e6354b0a20fea901bdd9c7d9d359d1e5
+Subproject commit 22acac44f1010ff2d27eb50e7b94a537ae06cb61