diff --git a/Common/Atomic_Win32.h b/Common/Atomic_Win32.h index e15101733c..7040deb809 100644 --- a/Common/Atomic_Win32.h +++ b/Common/Atomic_Win32.h @@ -88,6 +88,10 @@ inline void AtomicStoreRelease(volatile T& dest, U value) dest = (T)value; // 32-bit writes are always atomic } +#ifdef __MINGW32__ +void *_InterlockedExchangePointer_acq(void *volatile *, void volatile *); +#endif + template inline T* AtomicExchangeAcquire(T* volatile& loc, U newval) { diff --git a/Common/Common.h b/Common/Common.h index f93a71c465..9a8a6d4270 100644 --- a/Common/Common.h +++ b/Common/Common.h @@ -62,11 +62,6 @@ private: #elif defined(_WIN32) -// Check MSC ver - #if !defined _MSC_VER || _MSC_VER <= 1000 - #error needs at least version 1000 of MSC - #endif - // Memory leak checks #define CHECK_HEAP_INTEGRITY() diff --git a/Common/ConsoleListener.cpp b/Common/ConsoleListener.cpp index 7f9e0a7f71..d899aaf1fd 100644 --- a/Common/ConsoleListener.cpp +++ b/Common/ConsoleListener.cpp @@ -77,7 +77,7 @@ ConsoleListener::~ConsoleListener() Close(); } -#ifdef _WIN32 +#if defined(_WIN32) // Handle console event bool WINAPI ConsoleHandler(DWORD msgType) { diff --git a/Common/FileUtil.h b/Common/FileUtil.h index f0ce750010..5a0a9cb1f3 100644 --- a/Common/FileUtil.h +++ b/Common/FileUtil.h @@ -25,7 +25,7 @@ #include "Common.h" -#ifdef _WIN32 +#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/Common/MsgHandler.h b/Common/MsgHandler.h index 97e865bedf..75e8137e10 100644 --- a/Common/MsgHandler.h +++ b/Common/MsgHandler.h @@ -33,7 +33,7 @@ extern bool MsgAlert(bool yes_no, int Style, const char* format, ...) void SetEnableAlert(bool enable); #ifndef GEKKO -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__MINGW32__) #define PanicAlert(format, ...) MsgAlert(false, WARNING, format, __VA_ARGS__) #define PanicYesNo(format, ...) MsgAlert(true, WARNING, format, __VA_ARGS__) #else