franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

microprofile: unbreak on POSIX systems

Browse Source 
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'
                                 ^
[...]
This commit is contained in:
Jan Beich 2016-10-10 03:07:53 +00:00
parent 702439b519
commit 50ce19b3ff
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
externals/microprofile/microprofile.h vendored
View File

@ -206,7 +206,7 @@ int64_t MicroProfileGetTick();
#define MP_GETCURRENTTHREADID() GetCurrentThreadId() #define MP_GETCURRENTTHREADID() GetCurrentThreadId()
typedef uint32_t ThreadIdType; typedef uint32_t ThreadIdType;
#elif defined(__linux__) #elif !defined(_WIN32)
#include <unistd.h> #include <unistd.h>
#include <time.h> #include <time.h>
inline int64_t MicroProfileTicksPerSecondCpu() inline int64_t MicroProfileTicksPerSecondCpu()
@ -510,7 +510,7 @@ typedef int MpSocket;
#endif #endif
#if defined(__APPLE__) || defined(__linux__) #ifndef _WIN32
typedef pthread_t MicroProfileThread; typedef pthread_t MicroProfileThread;
#elif defined(_WIN32) #elif defined(_WIN32)
typedef HANDLE MicroProfileThread; typedef HANDLE MicroProfileThread;
@ -907,7 +907,7 @@ int64_t MicroProfileGetTick()
typedef void* (*MicroProfileThreadFunc)(void*); typedef void* (*MicroProfileThreadFunc)(void*);
#if defined(__APPLE__) || defined(__linux__) #ifndef _WIN32
typedef pthread_t MicroProfileThread; typedef pthread_t MicroProfileThread;
void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func) void MicroProfileThreadStart(MicroProfileThread* pThread, MicroProfileThreadFunc Func)
{ {
@ -959,7 +959,7 @@ inline void MicroProfileThreadJoin(MicroProfileThread* pThread)
#define MP_INVALID_SOCKET(f) (f == INVALID_SOCKET) #define MP_INVALID_SOCKET(f) (f == INVALID_SOCKET)
#endif #endif
#if defined(__APPLE__) #ifndef _WIN32
#include <sys/socket.h> #include <sys/socket.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <fcntl.h> #include <fcntl.h>

1
externals/microprofile/microprofileui.h vendored
View File

@ -172,6 +172,7 @@ MICROPROFILEUI_API void MicroProfileCustomGroupAddTimer(const char* pCustomName,
#ifdef _WIN32 #ifdef _WIN32
#define snprintf _snprintf #define snprintf _snprintf
#endif #endif
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <math.h> #include <math.h>