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

Merge pull request #77 from scribam/msvc-fixes 

Compilation fixes for MSVC
This commit is contained in:
flyinghead 2020-04-21 10:23:16 +02:00 committed by GitHub
parent 64249eb68e 58abddfd27
commit 8b7fcc4084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/hw/naomi/naomi_m3comm.cpp
View File

@ -59,14 +59,14 @@ void NaomiM3Comm::receiveNetwork()
const u32 slot_size = swap16(*(u16*)&m68k_ram[0x204]); const u32 slot_size = swap16(*(u16*)&m68k_ram[0x204]);
const u32 packet_size = slot_size * slot_count; const u32 packet_size = slot_size * slot_count;
u8 buf[packet_size]; std::unique_ptr<u8[]> buf(new u8[packet_size]);
if (network.receive(buf, packet_size)) if (network.receive(buf.get(), packet_size))
{ {
packet_number += slot_count - 1; packet_number += slot_count - 1;
*(u16*)&comm_ram[6] = swap16(packet_number); *(u16*)&comm_ram[6] = swap16(packet_number);
std::unique_lock<std::mutex> lock(mem_mutex); std::unique_lock<std::mutex> lock(mem_mutex);
memcpy(&comm_ram[0x100 + slot_size], buf, packet_size); memcpy(&comm_ram[0x100 + slot_size], buf.get(), packet_size);
} }
} }

4
core/network/naomi_network.cpp
View File

@ -27,6 +27,10 @@
#include "hw/naomi/naomi_cart.h" #include "hw/naomi/naomi_cart.h"
#include "hw/naomi/naomi_flashrom.h" #include "hw/naomi/naomi_flashrom.h"
#ifdef _MSC_VER
typedef int ssize_t;
#endif
sock_t NaomiNetwork::createAndBind(int protocol) sock_t NaomiNetwork::createAndBind(int protocol)
{ {
sock_t sock = socket(AF_INET, protocol == IPPROTO_TCP ? SOCK_STREAM : SOCK_DGRAM, protocol); sock_t sock = socket(AF_INET, protocol == IPPROTO_TCP ? SOCK_STREAM : SOCK_DGRAM, protocol);