| commit | 0461682287658c6b5d1fb6fd5eef3319774899a6 | [log] [tgz] |
|---|---|---|
| author | Benjamin Lerman <qsr@chromium.org> | Mon Dec 22 13:08:16 2014 +0100 |
| committer | Benjamin Lerman <qsr@chromium.org> | Mon Dec 22 13:08:16 2014 +0100 |
| tree | 6ba573e4a87cb0904f14b8401781c0aca937b4a0 | |
| parent | 3c015e18d26bd328f61933dc400a55fcdac93ba5 [diff] [blame] |
Update from https://crrev.com/309415 Review URL: https://codereview.chromium.org/822713002
diff --git a/base/logging.cc b/base/logging.cc index 327ac77..5d65fa5 100644 --- a/base/logging.cc +++ b/base/logging.cc
@@ -659,7 +659,7 @@ if (log_timestamp) { time_t t = time(NULL); struct tm local_time = {0}; -#if _MSC_VER >= 1400 +#ifdef _MSC_VER localtime_s(&local_time, &t); #else localtime_r(&t, &local_time);