diff options
| author | darkf <lw9k123@gmail.com> | 2014-12-30 04:59:14 +0100 |
|---|---|---|
| committer | darkf <lw9k123@gmail.com> | 2014-12-30 05:12:03 +0100 |
| commit | 5d10b212ecebb15fb1463edc08c725d8e29fa44a (patch) | |
| tree | 206a1417e59815789eca81249734b0eb5497d5e3 /src/common/thread.cpp | |
| parent | Fix merge conflicts (diff) | |
| download | yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.gz yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.bz2 yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.lz yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.xz yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.tar.zst yuzu-5d10b212ecebb15fb1463edc08c725d8e29fa44a.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/common/thread.cpp | 6 |
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 int CurrentThreadId() { -#ifdef MSVC_VER +#ifdef _MSC_VER return GetCurrentThreadId(); #elif defined __APPLE__ return mach_thread_self(); @@ -34,7 +34,7 @@ void SleepCurrentThread(int ms) } #endif -#ifdef MSVC_VER +#ifdef _MSC_VER void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask) { @@ -121,7 +121,7 @@ void SwitchCurrentThread() #endif // MinGW with the POSIX threading model does not support pthread_setname_np -#if !defined(_WIN32) || defined(MSVC_VER) +#if !defined(_WIN32) || defined(_MSC_VER) void SetCurrentThreadName(const char* szThreadName) { #ifdef __APPLE__ |