diff options
| author | bunnei <bunneidev@gmail.com> | 2016-11-15 20:07:23 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-15 20:07:23 -0500 |
| commit | fb13bfe693e9536df700b675fef3affe09622fdd (patch) | |
| tree | 133bc7a610f8ae94a5381f8c8aaba6a6050d7ac1 /externals/microprofile/microprofile.h | |
| parent | 5a31552764dc8970253e642f4b829a8b785375c6 (diff) | |
| parent | c3ea6f4ddb4aeed9663b5039e9ab11a7fef7c395 (diff) | |
Merge pull request #2172 from jroweboy/fix-mingw
Fix mingw compilation support
Diffstat (limited to 'externals/microprofile/microprofile.h')
| -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; #ifndef _WIN32 typedef pthread_t MicroProfileThread; -#elif defined(_WIN32) +#elif defined(_MSC_VER) typedef HANDLE MicroProfileThread; #else typedef std::thread* MicroProfileThread; @@ -921,7 +921,7 @@ void MicroProfileThreadJoin(MicroProfileThread* pThread) int r = pthread_join(*pThread, 0); MP_ASSERT(r == 0); } -#elif defined(_WIN32) +#elif defined(_MSC_VER) typedef HANDLE MicroProfileThread; DWORD _stdcall ThreadTrampoline(void* pFunc) { |