Amebis/ZRCola
Amebis/ZRCola
1
1
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases 49 Wiki Activity

Unify Windows.h inclusion

Browse Source 
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>
This commit is contained in:
Simon Rozman 2021-11-15 11:50:29 +01:00
parent fc7f9da219
commit 1a8884fcab
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MSI/MSICA

@ -1 +1 @@
Subproject commit f943510140b067645a42864a99a5e196f64cccc6
Subproject commit 5a67199179607eb1ae2523440f7b20c5e4c20325

2
lib/WinStd

@ -1 +1 @@
Subproject commit b8816476e5f6f4f8465add75ac7bba5c742a2db6
Subproject commit 82935bd8e0b10f1c29149d2c1639b64392f575cd

7
lib/libZRCola/include/zrcola/common.h
View File

@ -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)

2
lib/wxExtend

@ -1 +1 @@
Subproject commit d9af15c0e6354b0a20fea901bdd9c7d9d359d1e5
Subproject commit 22acac44f1010ff2d27eb50e7b94a537ae06cb61