diff options
| author | Sebastian Valle <subv2112@gmail.com> | 2016-12-11 14:44:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-11 14:44:21 -0500 |
| commit | 7993d67ca9b066ebcd6b15a5cc6e6bbed941fcc2 (patch) | |
| tree | 92f4d13a3c2cca41664f8d4a31c09ad9dd3e80ae /src/core | |
| parent | 6aa68fe8daf7be4da9bb5340db5c9673c77d262d (diff) | |
| parent | 305cc20144eedf713111109b12398acf191aed38 (diff) | |
Merge pull request #2267 from JayFoxRox/fix-mingw-cc
Support mingw cross-compilation
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/gdbstub/gdbstub.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp index aea43e92ba..21d941363e 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp @@ -15,8 +15,8 @@ #include <fcntl.h> #ifdef _WIN32 -#include <WinSock2.h> -#include <common/x64/abi.h> +#include <winsock2.h> +// winsock2.h needs to be included first to prevent winsock.h being included by other includes #include <io.h> #include <iphlpapi.h> #include <ws2tcpip.h> |