Merge branch 'master' into surround

2021-05-20 11:02:26 +02:00
parent 825efb512a 29674b8ed0
commit cb101eca16
2 changed files with 5 additions and 1 deletions
@@ -2,11 +2,14 @@
 #include <iomanip>
 #include <sstream>

+// prevent clang format from "optimizing" the header include order
+// clang-format off
+#include <winsock2.h>
 #include <iphlpapi.h>
 #include <windows.h>
-#include <winsock2.h>
 #include <winuser.h>
 #include <ws2tcpip.h>
+// clang-format on

 #include <ViGEm/Client.h>