diff options
| author |  darkf | 2014-12-29 19:47:41 -0800 |
|---|---|---|
| committer | darkf | 2014-12-29 19:47:41 -0800 |
| commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
| tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /src/common/platform.h | |
| parent | Add comment regarding __WIN32__ in SkyEye code (diff) | |
| parent | Merge pull request #367 from bunnei/usat_ssat (diff) | |
| download | yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.gz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.tar.xz yuzu-8ba9ac0f74abb0408a26207a76a0c1808bad8de0.zip | |
Fix merge conflicts
Diffstat (limited to 'src/common/platform.h')
| -rw-r--r-- | src/common/platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/platform.h b/src/common/platform.h index 7d123caa0..ce5550520 100644 --- a/src/common/platform.h +++ b/src/common/platform.h | |||
| @@ -80,7 +80,7 @@ | |||
| 80 | 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) { |
| 81 | if (localtime_s(result, clock) == 0) | 81 | if (localtime_s(result, clock) == 0) |
| 82 | return result; | 82 | return result; |
| 83 | return NULL; | 83 | return nullptr; |
| 84 | } | 84 | } |
| 85 | #endif | 85 | #endif |
| 86 | 86 | ||