diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-21 19:14:20 +0200 |
|---|---|---|
| committer | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2015-06-28 01:36:55 +0200 |
| commit | 7b746914b929df4ed6aacaa13af8e35815be0bf1 (patch) | |
| tree | 7cf79889274e821ce4cf372524d14783fb30ebf7 | |
| parent | Core, VideoCore: Replace or fix exit() calls. (diff) | |
| download | yuzu-7b746914b929df4ed6aacaa13af8e35815be0bf1.tar yuzu-7b746914b929df4ed6aacaa13af8e35815be0bf1.tar.gz yuzu-7b746914b929df4ed6aacaa13af8e35815be0bf1.tar.bz2 yuzu-7b746914b929df4ed6aacaa13af8e35815be0bf1.tar.lz yuzu-7b746914b929df4ed6aacaa13af8e35815be0bf1.tar.xz yuzu-7b746914b929df4ed6aacaa13af8e35815be0bf1.tar.zst yuzu-7b746914b929df4ed6aacaa13af8e35815be0bf1.zip | |
| -rw-r--r-- | src/core/hle/service/soc_u.cpp | 60 | ||||
| -rw-r--r-- | src/core/hle/service/soc_u.h | 2 |
2 files changed, 36 insertions, 26 deletions
diff --git a/src/core/hle/service/soc_u.cpp b/src/core/hle/service/soc_u.cpp index 6a2cab414..5b2a643d8 100644 --- a/src/core/hle/service/soc_u.cpp +++ b/src/core/hle/service/soc_u.cpp @@ -2,38 +2,46 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <algorithm> +#include <cstring> +#include <unordered_map> + +#include "common/assert.h" +#include "common/bit_field.h" +#include "common/common_types.h" #include "common/logging/log.h" +#include "common/scope_exit.h" -#ifdef _WIN32 -#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 +#include "core/hle/kernel/session.h" +#include "core/hle/result.h" +#include "core/hle/service/soc_u.h" +#include "core/memory.h" +#ifdef _WIN32 + #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> -#include <netdb.h> -#include <arpa/inet.h> -#include <fcntl.h> -#include <poll.h> + #include <cerrno> + #include <fcntl.h> + #include <netinet/in.h> + #include <netdb.h> + #include <poll.h> + #include <sys/socket.h> + #include <unistd.h> #endif -#include "common/scope_exit.h" -#include "core/hle/hle.h" -#include "core/hle/service/soc_u.h" -#include <unordered_map> - #ifdef _WIN32 # define WSAEAGAIN WSAEWOULDBLOCK # define WSAEMULTIHOP -1 // Invalid dummy value diff --git a/src/core/hle/service/soc_u.h b/src/core/hle/service/soc_u.h index 483b3111b..a091f597c 100644 --- a/src/core/hle/service/soc_u.h +++ b/src/core/hle/service/soc_u.h @@ -4,6 +4,8 @@ #pragma once +#include <string> + #include "core/hle/service/service.h" //////////////////////////////////////////////////////////////////////////////////////////////////// |