diff options
| author | darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
|---|---|---|
| committer | darkf <lw9k123@gmail.com> | 2014-12-29 19:47:41 -0800 |
| commit | 8ba9ac0f74abb0408a26207a76a0c1808bad8de0 (patch) | |
| tree | f1c7c3393fa726435b5b90bf335567c93e528ef1 /src/common/platform.h | |
| parent | a19354acedbfeafd28219c48a1ec32f76dd17a54 (diff) | |
| parent | 3d14eb285382740b144e5b047cb2ad072f6129ea (diff) | |
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 7d123caa03..ce5550520f 100644 --- a/src/common/platform.h +++ b/src/common/platform.h @@ -80,7 +80,7 @@ inline struct tm* localtime_r(const time_t *clock, struct tm *result) { if (localtime_s(result, clock) == 0) return result; - return NULL; + return nullptr; } #endif |