summaryrefslogtreecommitdiffstats
path: root/src/common/platform.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-12-31 05:54:02 +0100
committerbunnei <bunneidev@gmail.com>2014-12-31 05:54:02 +0100
commit29da5da9513c0faae0880d2fced18f80ef89923b (patch)
tree9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/platform.h
parentMerge pull request #372 from lioncash/warn (diff)
parentFix MSVC-related #defines and add CMakeLists comment (diff)
downloadyuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar
yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.gz
yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.bz2
yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.lz
yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.xz
yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.zst
yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.zip
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