diff options
Diffstat (limited to 'externals/microprofile')
| -rw-r--r-- | externals/microprofile/microprofile.h | 2 | ||||
| -rw-r--r-- | externals/microprofile/microprofileui.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index f45c9ba82..384863ccc 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h | |||
| @@ -201,7 +201,7 @@ typedef uint64_t ThreadIdType; | |||
| 201 | int64_t MicroProfileGetTick(); | 201 | int64_t MicroProfileGetTick(); |
| 202 | #define MP_TICK() MicroProfileGetTick() | 202 | #define MP_TICK() MicroProfileGetTick() |
| 203 | #define MP_BREAK() __debugbreak() | 203 | #define MP_BREAK() __debugbreak() |
| 204 | #define MP_THREAD_LOCAL __declspec(thread) | 204 | #define MP_THREAD_LOCAL thread_local |
| 205 | #define MP_STRCASECMP _stricmp | 205 | #define MP_STRCASECMP _stricmp |
| 206 | #define MP_GETCURRENTTHREADID() GetCurrentThreadId() | 206 | #define MP_GETCURRENTTHREADID() GetCurrentThreadId() |
| 207 | typedef uint32_t ThreadIdType; | 207 | typedef uint32_t ThreadIdType; |
diff --git a/externals/microprofile/microprofileui.h b/externals/microprofile/microprofileui.h index 66a73abc5..09223b33f 100644 --- a/externals/microprofile/microprofileui.h +++ b/externals/microprofile/microprofileui.h | |||
| @@ -1231,7 +1231,7 @@ void MicroProfileDrawDetailedBars(uint32_t nWidth, uint32_t nHeight, int nBaseY, | |||
| 1231 | char ThreadName[MicroProfileThreadLog::THREAD_MAX_LEN + 16]; | 1231 | char ThreadName[MicroProfileThreadLog::THREAD_MAX_LEN + 16]; |
| 1232 | const char* cLocal = MicroProfileIsLocalThread(nThreadId) ? "*": " "; | 1232 | const char* cLocal = MicroProfileIsLocalThread(nThreadId) ? "*": " "; |
| 1233 | 1233 | ||
| 1234 | #if defined(WIN32) | 1234 | #if defined(_WIN32) |
| 1235 | // nThreadId is 32-bit on Windows | 1235 | // nThreadId is 32-bit on Windows |
| 1236 | int nStrLen = snprintf(ThreadName, sizeof(ThreadName)-1, "%04x: %s%s", nThreadId, cLocal, i < nNumThreadsBase ? &S.Pool[i]->ThreadName[0] : MICROPROFILE_THREAD_NAME_FROM_ID(nThreadId) ); | 1236 | int nStrLen = snprintf(ThreadName, sizeof(ThreadName)-1, "%04x: %s%s", nThreadId, cLocal, i < nNumThreadsBase ? &S.Pool[i]->ThreadName[0] : MICROPROFILE_THREAD_NAME_FROM_ID(nThreadId) ); |
| 1237 | #else | 1237 | #else |