summaryrefslogtreecommitdiff
path: root/src/common/platform.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-30 23:54:02 -0500
committerbunnei <bunneidev@gmail.com>2014-12-30 23:54:02 -0500
commit29da5da9513c0faae0880d2fced18f80ef89923b (patch)
tree9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/platform.h
parent74d7b45d09c172bdb6dce665903537a784acb110 (diff)
parent5d10b212ecebb15fb1463edc08c725d8e29fa44a (diff)
Merge pull request #369 from darkf/mingw_
Fix MinGW build (2)
Diffstat (limited to 'src/common/platform.h')
-rw-r--r--src/common/platform.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/platform.h b/src/common/platform.h
index 53d98fe74..ce9cfd4a2 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -71,14 +71,18 @@
#include <time.h>
+#ifndef NOMINMAX
#define NOMINMAX
+#endif
#define EMU_FASTCALL __fastcall
+#ifdef _MSC_VER
inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
if (localtime_s(result, clock) == 0)
return result;
return nullptr;
}
+#endif
#else