summaryrefslogtreecommitdiff
path: root/src/common/platform.h
diff options
context:
space:
mode:
authorGravatar bunnei2014-12-07 13:40:04 -0500
committerGravatar bunnei2014-12-07 13:40:04 -0500
commit2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c (patch)
tree4beadeb20c206faf4f85c25d15eee39c964857f6 /src/common/platform.h
parentMerge pull request #252 from yuriks/patch-1 (diff)
parentChange NULLs to nullptrs. (diff)
downloadyuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.gz
yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.xz
yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.zip
Merge pull request #245 from rohit-n/null-nullptr
Change NULLs to nullptrs.
Diffstat (limited to 'src/common/platform.h')
-rw-r--r--src/common/platform.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/platform.h b/src/common/platform.h
index d9f095433..53d98fe74 100644
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -77,7 +77,7 @@
77inline struct tm* localtime_r(const time_t *clock, struct tm *result) { 77inline struct tm* localtime_r(const time_t *clock, struct tm *result) {
78 if (localtime_s(result, clock) == 0) 78 if (localtime_s(result, clock) == 0)
79 return result; 79 return result;
80 return NULL; 80 return nullptr;
81} 81}
82 82
83#else 83#else