diff options
| author | 2014-12-30 23:54:02 -0500 | |
|---|---|---|
| committer | 2014-12-30 23:54:02 -0500 | |
| commit | 29da5da9513c0faae0880d2fced18f80ef89923b (patch) | |
| tree | 9a652fd606e57f322ca07e1468ea3ae83addf6a2 /src/common/platform.h | |
| parent | Merge pull request #372 from lioncash/warn (diff) | |
| parent | Fix MSVC-related #defines and add CMakeLists comment (diff) | |
| download | yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.gz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.tar.xz yuzu-29da5da9513c0faae0880d2fced18f80ef89923b.zip | |
Merge pull request #369 from darkf/mingw_
Fix MinGW build (2)
Diffstat (limited to 'src/common/platform.h')
| -rw-r--r-- | src/common/platform.h | 4 |
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 @@ | |||
| 71 | 71 | ||
| 72 | #include <time.h> | 72 | #include <time.h> |
| 73 | 73 | ||
| 74 | #ifndef NOMINMAX | ||
| 74 | #define NOMINMAX | 75 | #define NOMINMAX |
| 76 | #endif | ||
| 75 | #define EMU_FASTCALL __fastcall | 77 | #define EMU_FASTCALL __fastcall |
| 76 | 78 | ||
| 79 | #ifdef _MSC_VER | ||
| 77 | inline struct tm* localtime_r(const time_t *clock, struct tm *result) { | 80 | inline struct tm* localtime_r(const time_t *clock, struct tm *result) { |
| 78 | if (localtime_s(result, clock) == 0) | 81 | if (localtime_s(result, clock) == 0) |
| 79 | return result; | 82 | return result; |
| 80 | return nullptr; | 83 | return nullptr; |
| 81 | } | 84 | } |
| 85 | #endif | ||
| 82 | 86 | ||
| 83 | #else | 87 | #else |
| 84 | 88 | ||