From ed98785831c2638d0f4ea518a8c5123b94508607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Mon, 20 Jul 2020 23:05:00 +0200
Subject: [PATCH] Temporary buildfix

---
 Core/HLE/proAdhoc.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
index ee9c2775ae..e27b74e80e 100644
--- a/Core/HLE/proAdhoc.cpp
+++ b/Core/HLE/proAdhoc.cpp
@@ -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]);