summaryrefslogtreecommitdiff
path: root/externals/microprofile
diff options
context:
space:
mode:
authorGravatar Jan Beich2016-10-10 03:07:53 +0000
committerGravatar Jan Beich2016-10-27 23:28:30 +0000
commit50ce19b3ff64f26194009df73c456b9035d903c6 (patch)
tree66abe60fae76a933562519db38ebe558abde8b77 /externals/microprofile
parentcore: some errno values are uncommon on Unix (diff)
downloadyuzu-50ce19b3ff64f26194009df73c456b9035d903c6.tar.gz
yuzu-50ce19b3ff64f26194009df73c456b9035d903c6.tar.xz
yuzu-50ce19b3ff64f26194009df73c456b9035d903c6.zip
microprofile: unbreak on POSIX systems
In file included from src/common/microprofile.cpp:7: In file included from src/./common/microprofile.h:23: externals/microprofile/microprofile.h:830:5: error: use of undeclared identifier 'MP_BREAK' MP_ASSERT(t == nBegin); ^ externals/microprofile/microprofile.h:238:34: note: expanded from macro 'MP_ASSERT' ^ externals/microprofile/microprofile.h:831:5: error: use of undeclared identifier 'MP_BREAK' MP_ASSERT(nTimerIndex == (nToken&0x3fff)); ^ externals/microprofile/microprofile.h:238:34: note: expanded from macro 'MP_ASSERT' ^ [...]
Diffstat (limited to 'externals/microprofile')
-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();
206#define MP_GETCURRENTTHREADID() GetCurrentThreadId() 206#define MP_GETCURRENTTHREADID() GetCurrentThreadId()
207typedef uint32_t ThreadIdType; 207typedef uint32_t ThreadIdType;
208 208
209#elif defined(__linux__) 209#elif !defined(_WIN32)
210#include <unistd.h> 210#include <unistd.h>
211#include <time.h> 211#include <time.h>
212inline int64_t MicroProfileTicksPerSecondCpu() 212inline int64_t MicroProfileTicksPerSecondCpu()
@@ -510,7 +510,7 @@ typedef int MpSocket;
510#endif 510#endif
511 511
512 512
513#if defined(__APPLE__) || defined(__linux__) 513#ifndef _WIN32
514typedef pthread_t MicroProfileThread; 514typedef pthread_t MicroProfileThread;
515#elif defined(_WIN32) 515#elif defined(_WIN32)
516typedef HANDLE MicroProfileThread; 516typedef HANDLE MicroProfileThread;
@@ -907,7 +907,7 @@ int64_t MicroProfileGetTick()
907 907
908typedef void* (*MicroProfileThreadFunc)(void*); 908typedef void* (*MicroProfileThreadFunc)(void*);
909 909
910#if defined(__APPLE__) || defined(__linux__) 910#ifndef _WIN32
911typedef pthread_t MicroProfileThread; 911typedef pthread_t MicroProfileThread;
912void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func) 912void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func)
913{ 913{
@@ -959,7 +959,7 @@ inline void MicroProfileThreadJoin(MicroProfileThread* pThread)
959#define MP_INVALID_SOCKET(f) (f == INVALID_SOCKET) 959#define MP_INVALID_SOCKET(f) (f == INVALID_SOCKET)
960#endif 960#endif
961 961
962#if defined(__APPLE__) 962#ifndef _WIN32
963#include <sys/socket.h> 963#include <sys/socket.h>
964#include <netinet/in.h> 964#include <netinet/in.h>
965#include <fcntl.h> 965#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,
172#ifdef _WIN32 172#ifdef _WIN32
173#define snprintf _snprintf 173#define snprintf _snprintf
174#endif 174#endif
175#include <stdio.h>
175#include <stdlib.h> 176#include <stdlib.h>
176#include <stdarg.h> 177#include <stdarg.h>
177#include <math.h> 178#include <math.h>