diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-01-12 00:44:45 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-12 00:44:45 -0500 |
| commit | 2f7069f9bda8ce466e99b1202eaa1cc06125fd6f (patch) | |
| tree | 968b7da92722d34ab37153f39aedfed693fed376 /src | |
| parent | eacc2a501ba75a4f89e172eafddbf590f7851add (diff) | |
| parent | 67c644e317b2d7057f2f403ce2d095299319a2f2 (diff) | |
Merge pull request #452 from darkf/mingwagain
Fix MinGW build, again
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra/citra.rc | bin | 566 -> 282 bytes | |||
| -rw-r--r-- | src/core/hle/service/soc_u.cpp | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/citra/citra.rc b/src/citra/citra.rc Binary files differindex c28e7dbe..0165e93d 100644 --- a/src/citra/citra.rc +++ b/src/citra/citra.rc diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index f502c6af..bb8ee86b 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -7,6 +7,19 @@ #if EMU_PLATFORM == PLATFORM_WINDOWS #include <winsock2.h> #include <ws2tcpip.h> + +// MinGW does not define several errno constants +#ifndef _MSC_VER +#define EBADMSG 104 +#define ENODATA 120 +#define ENOMSG 122 +#define ENOSR 124 +#define ENOSTR 125 +#define ETIME 137 +#define EIDRM 2001 +#define ENOLINK 2002 +#endif // _MSC_VER + #else #include <sys/socket.h> #include <netinet/in.h> |