OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-18 19:10:04 +00:00
Code Issues Projects Releases Wiki Activity

Core: Cleanup soc:U includes.

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2015-06-21 18:14:20 +01:00
parent f48b28ad27
commit 7b746914b9
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/core/hle/service/soc_u.cpp
View File

@ -2,38 +2,46 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // 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/logging/log.h"
#include "common/scope_exit.h"
#include "core/hle/kernel/session.h"
#include "core/hle/result.h"
#include "core/hle/service/soc_u.h"
#include "core/memory.h"
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.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
// 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 #else
#include <sys/socket.h> #include <cerrno>
#include <netinet/in.h> #include <fcntl.h>
#include <netdb.h> #include <netinet/in.h>
#include <arpa/inet.h> #include <netdb.h>
#include <fcntl.h> #include <poll.h>
#include <poll.h> #include <sys/socket.h>
#include <unistd.h>
#endif #endif
#include "common/scope_exit.h"
#include "core/hle/hle.h"
#include "core/hle/service/soc_u.h"
#include <unordered_map>
#ifdef _WIN32 #ifdef _WIN32
# define WSAEAGAIN WSAEWOULDBLOCK # define WSAEAGAIN WSAEWOULDBLOCK
# define WSAEMULTIHOP -1 // Invalid dummy value # define WSAEMULTIHOP -1 // Invalid dummy value

2
src/core/hle/service/soc_u.h
View File

@ -4,6 +4,8 @@
#pragma once #pragma once
#include <string>
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////