summaryrefslogtreecommitdiff
path: root/src/common/thread.cpp
diff options
context:
space:
mode:
authorGravatar darkf2014-12-29 19:59:14 -0800
committerGravatar darkf2014-12-29 20:12:03 -0800
commit5d10b212ecebb15fb1463edc08c725d8e29fa44a (patch)
tree206a1417e59815789eca81249734b0eb5497d5e3 /src/common/thread.cpp
parentFix merge conflicts (diff)
downloadyuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.gz
yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.xz
yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.zip
Fix MSVC-related #defines and add CMakeLists comment
Diffstat (limited to 'src/common/thread.cpp')
-rw-r--r--src/common/thread.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/thread.cpp b/src/common/thread.cpp
index 04e33101b..8bf005857 100644
--- a/src/common/thread.cpp
+++ b/src/common/thread.cpp
@@ -17,7 +17,7 @@ namespace Common
17 17
18int CurrentThreadId() 18int CurrentThreadId()
19{ 19{
20#ifdef MSVC_VER 20#ifdef _MSC_VER
21 return GetCurrentThreadId(); 21 return GetCurrentThreadId();
22#elif defined __APPLE__ 22#elif defined __APPLE__
23 return mach_thread_self(); 23 return mach_thread_self();
@@ -34,7 +34,7 @@ void SleepCurrentThread(int ms)
34} 34}
35#endif 35#endif
36 36
37#ifdef MSVC_VER 37#ifdef _MSC_VER
38 38
39void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask) 39void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask)
40{ 40{
@@ -121,7 +121,7 @@ void SwitchCurrentThread()
121#endif 121#endif
122 122
123// MinGW with the POSIX threading model does not support pthread_setname_np 123// MinGW with the POSIX threading model does not support pthread_setname_np
124#if !defined(_WIN32) || defined(MSVC_VER) 124#if !defined(_WIN32) || defined(_MSC_VER)
125void SetCurrentThreadName(const char* szThreadName) 125void SetCurrentThreadName(const char* szThreadName)
126{ 126{
127#ifdef __APPLE__ 127#ifdef __APPLE__