diff options
| author |  bunnei | 2016-11-15 20:07:23 -0500 |
|---|---|---|
| committer |  GitHub | 2016-11-15 20:07:23 -0500 |
| commit | fb13bfe693e9536df700b675fef3affe09622fdd (patch) | |
| tree | 133bc7a610f8ae94a5381f8c8aaba6a6050d7ac1 /externals | |
| parent | Merge pull request #1753 from jroweboy/frame_layouts (diff) | |
| parent | Add mingw compile support (diff) | |
| download | yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.tar.gz yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.tar.xz yuzu-fb13bfe693e9536df700b675fef3affe09622fdd.zip | |
Merge pull request #2172 from jroweboy/fix-mingw
Fix mingw compilation support
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/microprofile/microprofile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/externals/microprofile/microprofile.h b/externals/microprofile/microprofile.h index 30613b3b0..f45c9ba82 100644 --- a/externals/microprofile/microprofile.h +++ b/externals/microprofile/microprofile.h | |||
| @@ -512,7 +512,7 @@ typedef int MpSocket; | |||
| 512 | 512 | ||
| 513 | #ifndef _WIN32 | 513 | #ifndef _WIN32 |
| 514 | typedef pthread_t MicroProfileThread; | 514 | typedef pthread_t MicroProfileThread; |
| 515 | #elif defined(_WIN32) | 515 | #elif defined(_MSC_VER) |
| 516 | typedef HANDLE MicroProfileThread; | 516 | typedef HANDLE MicroProfileThread; |
| 517 | #else | 517 | #else |
| 518 | typedef std::thread* MicroProfileThread; | 518 | typedef std::thread* MicroProfileThread; |
| @@ -921,7 +921,7 @@ void MicroProfileThreadJoin(MicroProfileThread* pThread) | |||
| 921 | int r = pthread_join(*pThread, 0); | 921 | int r = pthread_join(*pThread, 0); |
| 922 | MP_ASSERT(r == 0); | 922 | MP_ASSERT(r == 0); |
| 923 | } | 923 | } |
| 924 | #elif defined(_WIN32) | 924 | #elif defined(_MSC_VER) |
| 925 | typedef HANDLE MicroProfileThread; | 925 | typedef HANDLE MicroProfileThread; |
| 926 | DWORD _stdcall ThreadTrampoline(void* pFunc) | 926 | DWORD _stdcall ThreadTrampoline(void* pFunc) |
| 927 | { | 927 | { |