citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #1083 from yuriks/microprofile-vs2015 

Common: Fix MicroProfile compilation in MSVC2015
This commit is contained in:
bunnei 2015-08-31 21:20:36 -04:00
parent 071510b367 656d824b20
commit f05ae742a4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/microprofile.h
View File

@ -11,6 +11,11 @@
#define MICROPROFILE_CONTEXT_SWITCH_TRACE 0 #define MICROPROFILE_CONTEXT_SWITCH_TRACE 0
#define MICROPROFILE_PER_THREAD_BUFFER_SIZE (2048<<12) // 8 MB #define MICROPROFILE_PER_THREAD_BUFFER_SIZE (2048<<12) // 8 MB
#ifdef _WIN32
// This isn't defined by the standard library in MSVC2015
typedef void* HANDLE;
#endif
#include <microprofile.h> #include <microprofile.h>
#define MP_RGB(r, g, b) ((r) << 16 | (g) << 8 | (b) << 0) #define MP_RGB(r, g, b) ((r) << 16 | (g) << 8 | (b) << 0)