Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Temporary buildfix

Browse source
This commit is contained in:
Henrik Rydgård 2020-07-20 23:05:00 +02:00
parent 0cbcbaecf8
commit ed98785831
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Core/HLE/proAdhoc.cpp
View file

@ -106,8 +106,11 @@ bool isPTPPortInUse(uint16_t port) {
char* mac2str(SceNetEtherAddr* mac) {
#if defined(_WIN32)
static __declspec(thread) char str[18] = ":::::";
#else
#elif !PPSSPP_PLATFORM(MAC) && !PPSSPP_PLATFORM(IOS)
static __thread char str[18] = ":::::";
#else
// Temporary hack to avoid huge rebase conflicts. Remove this when applying the mac2str rewrite.
static char str[18] = ":::::";
#endif
if (mac == NULL) return str;
snprintf(str, sizeof(str), "%02x:%02x:%02x:%02x:%02x:%02x", mac->data[0], mac->data[1], mac->data[2], mac->data[3], mac->data[4], mac->data[5]);