summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2016-10-10 05:07:53 +0200
committerJan Beich <jbeich@FreeBSD.org>2016-10-28 01:28:30 +0200
commit50ce19b3ff64f26194009df73c456b9035d903c6 (patch)
tree66abe60fae76a933562519db38ebe558abde8b77
parentcore: some errno values are uncommon on Unix (diff)
downloadyuzu-50ce19b3ff64f26194009df73c456b9035d903c6.tar
yuzu-50ce19b3ff64f26194009df73c456b9035d903c6.tar.gz
yuzu-50ce19b3ff64f26194009df73c456b9035d903c6.tar.bz2
yuzu-50ce19b3ff64f26194009df73c456b9035d903c6.tar.lz
yuzu-50ce19b3ff64f26194009df73c456b9035d903c6.tar.xz
yuzu-50ce19b3ff64f26194009df73c456b9035d903c6.tar.zst
yuzu-50ce19b3ff64f26194009df73c456b9035d903c6.zip
-rw-r--r--externals/microprofile/microprofile.h8
-rw-r--r--externals/microprofile/microprofileui.h1
2 files changed, 5 insertions, 4 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h
index d1ae0c1c2..30613b3b0 100644
--- a/externals/microprofile/microprofile.h
+++ b/externals/microprofile/microprofile.h
@@ -206,7 +206,7 @@ int64_t MicroProfileGetTick();
#define MP_GETCURRENTTHREADID() GetCurrentThreadId()
typedef uint32_t ThreadIdType;
-#elif defined(__linux__)
+#elif !defined(_WIN32)
#include <unistd.h>
#include <time.h>
inline int64_t MicroProfileTicksPerSecondCpu()
@@ -510,7 +510,7 @@ typedef int MpSocket;
#endif
-#if defined(__APPLE__) || defined(__linux__)
+#ifndef _WIN32
typedef pthread_t MicroProfileThread;
#elif defined(_WIN32)
typedef HANDLE MicroProfileThread;
@@ -907,7 +907,7 @@ int64_t MicroProfileGetTick()
typedef void* (*MicroProfileThreadFunc)(void*);
-#if defined(__APPLE__) || defined(__linux__)
+#ifndef _WIN32
typedef pthread_t MicroProfileThread;
void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func)
{
@@ -959,7 +959,7 @@ inline void MicroProfileThreadJoin(MicroProfileThread* pThread)
#define MP_INVALID_SOCKET(f) (f == INVALID_SOCKET)
#endif
-#if defined(__APPLE__)
+#ifndef _WIN32
#include <sys/socket.h>
#include <netinet/in.h>
#include <fcntl.h>
diff --git a/externals/microprofile/microprofileui.h b/externals/microprofile/microprofileui.h
index 45bec8af6..66a73abc5 100644
--- a/externals/microprofile/microprofileui.h
+++ b/externals/microprofile/microprofileui.h
@@ -172,6 +172,7 @@ MICROPROFILEUI_API void MicroProfileCustomGroupAddTimer(const char* pCustomName,
#ifdef _WIN32
#define snprintf _snprintf
#endif
+#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
#include <math.h>