ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 0aa8e0f477 into 6851ed73f4

This commit is contained in:
Tygyh 2024-09-19 11:32:41 +02:00 committed by GitHub
parent 6851ed73f4 0aa8e0f477
commit e021af9d0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Core/HW/EXI/BBA/BuiltIn.cpp
View File

@ -834,7 +834,7 @@ BbaTcpSocket::ConnectingState BbaTcpSocket::Connected(StackRef* ref)
fd_set read_fds;
fd_set write_fds;
fd_set except_fds;
struct timeval t = {0, 0};
timeval t = {0, 0};
FD_ZERO(&read_fds);
FD_ZERO(&write_fds);
FD_ZERO(&except_fds);
@ -965,7 +965,7 @@ sf::Socket::Status BbaUdpSocket::Bind(u16 port, u32 net_ip)
// Subscribe to the SSDP multicast group
// NB: Other groups aren't supported because of HLE
struct ip_mreq mreq;
ip_mreq mreq;
mreq.imr_multiaddr.s_addr = std::bit_cast<u32>(Common::IP_ADDR_SSDP);
mreq.imr_interface.s_addr = net_ip;
if (setsockopt(getHandle(), IPPROTO_IP, IP_ADD_MEMBERSHIP, reinterpret_cast<const char*>(&mreq),

4
Source/Core/Core/HW/WiimoteReal/IOWin.cpp
View File

@ -197,8 +197,8 @@ void init_lib()
namespace WiimoteReal
{
int IOWrite(HANDLE& dev_handle, OVERLAPPED& hid_overlap_write, enum WinWriteMethod& stack,
const u8* buf, size_t len, DWORD* written);
int IOWrite(HANDLE& dev_handle, OVERLAPPED& hid_overlap_write, WinWriteMethod& stack, const u8* buf,
size_t len, DWORD* written);
int IORead(HANDLE& dev_handle, OVERLAPPED& hid_overlap_read, u8* buf, int index);
template <typename T>

2
Source/Core/Core/IOS/Network/IP/Top.cpp
View File

@ -623,7 +623,7 @@ IPCReply NetIPTopDevice::HandleInetAToNRequest(const IOCtlRequest& request)
auto& memory = system.GetMemory();
const std::string hostname = memory.GetString(request.buffer_in);
struct hostent* remoteHost = gethostbyname(hostname.c_str());
hostent* remoteHost = gethostbyname(hostname.c_str());
if (remoteHost == nullptr || remoteHost->h_addr_list == nullptr ||
remoteHost->h_addr_list[0] == nullptr)

2
Source/Core/Core/IOS/Network/KD/VFF/VFFUtil.cpp
View File

@ -27,7 +27,7 @@
static DRESULT read_vff_header(IOS::HLE::FS::FileHandle* vff, FATFS* fs)
{
struct IOS::HLE::NWC24::VFFHeader header;
IOS::HLE::NWC24::VFFHeader header;
if (!vff->Read(&header, 1))
{
ERROR_LOG_FMT(IOS_WC24, "Failed to read VFF header.");

4
Source/Core/Core/IOS/Network/Socket.cpp
View File

@ -770,7 +770,7 @@ WiiSocket::ConnectingState WiiSocket::GetConnectingState() const
fd_set read_fds;
fd_set write_fds;
fd_set except_fds;
struct timeval t = {0, 0};
timeval t = {0, 0};
FD_ZERO(&read_fds);
FD_ZERO(&write_fds);
FD_ZERO(&except_fds);
@ -998,7 +998,7 @@ void WiiSockMan::Update()
{
s32 nfds = 0;
fd_set read_fds, write_fds, except_fds;
struct timeval t = {0, 0};
timeval t = {0, 0};
FD_ZERO(&read_fds);
FD_ZERO(&write_fds);
FD_ZERO(&except_fds);

6
Source/Core/Core/IOS/USB/Bluetooth/hci.h
View File

@ -2505,7 +2505,7 @@ struct hci_filter
uint32_t mask[8]; /* 256 bits */
};
static __inline void hci_filter_set(uint8_t bit, struct hci_filter* filter)
static __inline void hci_filter_set(uint8_t bit, hci_filter* filter)
{
uint8_t off = bit - 1;
@ -2513,7 +2513,7 @@ static __inline void hci_filter_set(uint8_t bit, struct hci_filter* filter)
filter->mask[off] |= (1 << ((bit - 1) & 0x1f));
}
static __inline void hci_filter_clr(uint8_t bit, struct hci_filter* filter)
static __inline void hci_filter_clr(uint8_t bit, hci_filter* filter)
{
uint8_t off = bit - 1;
@ -2581,7 +2581,7 @@ struct btreq
uint16_t btri_link_policy; /* Link Policy */
uint16_t btri_packet_type; /* Packet Type */
} btri;
struct bt_stats btrs; /* unit stats */
bt_stats btrs; /* unit stats */
} btru;
};

2
Source/Core/Core/PowerPC/GDBStub.cpp
View File

@ -258,7 +258,7 @@ static void ReadCommand()
static bool IsDataAvailable()
{
struct timeval t;
timeval t;
fd_set _fds, *fds = &_fds;
FD_ZERO(fds);