diff options
| author |  Sebastian Valle | 2016-12-11 14:44:21 -0500 |
|---|---|---|
| committer |  GitHub | 2016-12-11 14:44:21 -0500 |
| commit | 2589c30cbee4e90b717cb8f42e1f25e2eabc119f (patch) | |
| tree | 92f4d13a3c2cca41664f8d4a31c09ad9dd3e80ae /src/core/gdbstub/gdbstub.cpp | |
| parent | Merge pull request #2154 from mailwl/apt-getstartupargument (diff) | |
| parent | gdbstub: Remove unused include (diff) | |
| download | yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.gz yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.tar.xz yuzu-2589c30cbee4e90b717cb8f42e1f25e2eabc119f.zip | |
Merge pull request #2267 from JayFoxRox/fix-mingw-cc
Support mingw cross-compilation
Diffstat (limited to 'src/core/gdbstub/gdbstub.cpp')
| -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 aea43e92b..21d941363 100644 --- a/src/core/gdbstub/gdbstub.cpp +++ b/src/core/gdbstub/gdbstub.cpp | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | #include <fcntl.h> | 15 | #include <fcntl.h> |
| 16 | 16 | ||
| 17 | #ifdef _WIN32 | 17 | #ifdef _WIN32 |
| 18 | #include <WinSock2.h> | 18 | #include <winsock2.h> |
| 19 | #include <common/x64/abi.h> | 19 | // winsock2.h needs to be included first to prevent winsock.h being included by other includes |
| 20 | #include <io.h> | 20 | #include <io.h> |
| 21 | #include <iphlpapi.h> | 21 | #include <iphlpapi.h> |
| 22 | #include <ws2tcpip.h> | 22 | #include <ws2tcpip.h> |