From 45d941d62e2accea92f5b5183afe760e69a618ac Mon Sep 17 00:00:00 2001
From: Jannik Vogel <email@jannikvogel.de>
Date: Sat, 3 Dec 2016 21:08:02 +0100
Subject: Support mingw cross-compile

---
 src/core/gdbstub/gdbstub.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp
index aea43e92b..aa849ab4b 100644
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
@@ -15,7 +15,8 @@
 #include <fcntl.h>
 
 #ifdef _WIN32
-#include <WinSock2.h>
+#include <winsock2.h>
+// winsock2.h needs to be included first to prevent winsock.h being included by other includes
 #include <common/x64/abi.h>
 #include <io.h>
 #include <iphlpapi.h>
-- 
cgit v1.2.3


From 0aee903adab317a11209aed4f4cb176cf62ca6d9 Mon Sep 17 00:00:00 2001
From: Jannik Vogel <email@jannikvogel.de>
Date: Mon, 5 Dec 2016 15:09:14 +0100
Subject: gdbstub: Remove unused include

---
 src/core/gdbstub/gdbstub.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/core')

diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp
index aa849ab4b..21d941363 100644
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
@@ -17,7 +17,6 @@
 #ifdef _WIN32
 #include <winsock2.h>
 // winsock2.h needs to be included first to prevent winsock.h being included by other includes
-#include <common/x64/abi.h>
 #include <io.h>
 #include <iphlpapi.h>
 #include <ws2tcpip.h>
-- 
cgit v1.2.3