Permalink
Browse files

Patches to make it possible to compile with mingw, pt. 1

  • Loading branch information...
twinaphex committed Aug 29, 2017
1 parent 9888d77 commit 418e341b32d307b4cd8cc4fe5931b09975fa40c8
Showing with 10 additions and 2 deletions.
  1. +4 −0 Common/Atomic_Win32.h
  2. +2 −0 Common/Common.h
  3. +1 −1 Common/ConsoleListener.cpp
  4. +2 −0 Common/FileUtil.h
  5. +1 −1 Common/MsgHandler.h
View
@@ -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 <typename T, typename U>
inline T* AtomicExchangeAcquire(T* volatile& loc, U newval)
{
View
@@ -64,7 +64,9 @@ class NonCopyable
// Check MSC ver
#if !defined _MSC_VER || _MSC_VER <= 1000
#ifndef __MINGW32__
#error needs at least version 1000 of MSC
#endif
#endif
// Memory leak checks
@@ -77,7 +77,7 @@ ConsoleListener::~ConsoleListener()
Close();
}
#ifdef _WIN32
#if defined(_WIN32) && !defined(__MINGW32__)
// Handle console event
bool WINAPI ConsoleHandler(DWORD msgType)
{
View
@@ -26,12 +26,14 @@
#include "Common.h"
#ifdef _WIN32
#ifndef __MINGW32__
inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
if (localtime_s(result, clock) == 0)
return result;
return NULL;
}
#endif
#endif
namespace File {
View
@@ -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

0 comments on commit 418e341

Please sign in to comment.