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 | |
| 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/log.h | 4 | ||||
| -rw-r--r-- | src/common/msg_handler.h | 2 | ||||
| -rw-r--r-- | src/common/platform.h | 2 | ||||
| -rw-r--r-- | src/common/string_util.cpp | 6 | ||||
| -rw-r--r-- | src/common/thread.cpp | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/common/log.h b/src/common/log.h index c6a023552..667f2fbb9 100644 --- a/src/common/log.h +++ b/src/common/log.h @@ -8,7 +8,7 @@ #include "common/msg_handler.h" #include "common/logging/log.h" -#ifdef MSVC_VER +#ifdef _MSC_VER #ifndef __func__ #define __func__ __FUNCTION__ #endif @@ -40,7 +40,7 @@ #define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_) #ifndef GEKKO -#ifdef _WIN32 +#ifdef _MSC_VER #define _assert_msg_(_t_, _a_, _fmt_, ...) \ if (!(_a_)) {\ if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \ diff --git a/src/common/msg_handler.h b/src/common/msg_handler.h index b4f380782..5a483ddb4 100644 --- a/src/common/msg_handler.h +++ b/src/common/msg_handler.h @@ -30,7 +30,7 @@ extern bool MsgAlert(bool yes_no, int Style, const char* format, ...) void SetEnableAlert(bool enable); #ifndef GEKKO -#ifdef MSVC_VER +#ifdef _MSC_VER #define SuccessAlert(format, ...) MsgAlert(false, INFORMATION, format, __VA_ARGS__) #define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) #define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__) diff --git a/src/common/platform.h b/src/common/platform.h index ce5550520..ce9cfd4a2 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -76,7 +76,7 @@ #endif #define EMU_FASTCALL __fastcall -#ifdef _MSVC_VER +#ifdef _MSC_VER inline struct tm* localtime_r(const time_t *clock, struct tm *result) { if (localtime_s(result, clock) == 0) return result; diff --git a/src/common/string_util.cpp b/src/common/string_util.cpp index 0dd2d2349..b3b772bd9 100644 --- a/src/common/string_util.cpp +++ b/src/common/string_util.cpp @@ -7,7 +7,7 @@ #include "common/common.h" #include "common/string_util.h" -#ifdef MSVC_VER +#ifdef _MSC_VER #include <Windows.h> #include <codecvt> #else @@ -45,7 +45,7 @@ bool CharArrayFromFormatV(char* out, int outsize, const char* format, va_list ar { int writtenCount; -#ifdef MSVC_VER +#ifdef _MSC_VER // You would think *printf are simple, right? Iterate on each character, // if it's a format specifier handle it properly, etc. // @@ -410,7 +410,7 @@ std::string UriEncode(const std::string & sSrc) return sResult; } -#ifdef MSVC_VER +#ifdef _MSC_VER std::string UTF16ToUTF8(const std::u16string& input) { 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__ |