Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 | 1 |
| 2 /* | 2 /* |
| 3 * Copyright 2006 The Android Open Source Project | 3 * Copyright 2006 The Android Open Source Project |
| 4 * | 4 * |
| 5 * Use of this source code is governed by a BSD-style license that can be | 5 * Use of this source code is governed by a BSD-style license that can be |
| 6 * found in the LICENSE file. | 6 * found in the LICENSE file. |
| 7 */ | 7 */ |
| 8 | 8 |
| 9 #include "SkTime.h" | 9 #include "SkTime.h" |
| 10 #include "SkTypes.h" | 10 #include "SkTypes.h" |
| 11 | 11 |
| 12 #include <sys/time.h> | 12 #include <sys/time.h> |
| 13 #include <time.h> | 13 #include <time.h> |
| 14 | 14 |
| 15 void SkTime::GetDateTime(DateTime* dt) | 15 void SkTime::GetDateTime(DateTime* dt) |
| 16 { | 16 { |
| 17 if (dt) | 17 if (dt) |
| 18 { | 18 { |
| 19 tzset(); // initialize timezone variable; | 19 tzset(); // initialize timezone variable; |
| 20 time_t m_time; | 20 time_t m_time; |
| 21 time(&m_time); | 21 time(&m_time); |
| 22 struct tm* tstruct; | 22 struct tm* tstruct; |
| 23 tstruct = localtime(&m_time); | 23 tstruct = localtime(&m_time); |
| 24 int offset = tstruct->tm_isdst == 1 ? 60 : 0; | 24 int offset = tstruct->tm_isdst == 1 ? 60 : 0; |
| 25 | 25 |
| 26 // http://pubs.opengroup.org/onlinepubs/009695399/basedefs/time.h.html | 26 // http://pubs.opengroup.org/onlinepubs/009695399/basedefs/time.h.html |
| 27 #if defined(_NEWLIB_VERSION) | |
| 28 dt->fTimeZoneMinutes = SkToS16(offset - _timezone / 60); | |
|
Mark Seaborn
2015/12/15 00:27:03
You don't need this change. I fixed nacl-newlib t
Sean Klein
2015/12/15 01:05:51
Done.
| |
| 29 #else | |
| 27 dt->fTimeZoneMinutes = SkToS16(offset - timezone / 60); | 30 dt->fTimeZoneMinutes = SkToS16(offset - timezone / 60); |
| 31 #endif | |
| 28 dt->fYear = tstruct->tm_year + 1900; | 32 dt->fYear = tstruct->tm_year + 1900; |
| 29 dt->fMonth = SkToU8(tstruct->tm_mon + 1); | 33 dt->fMonth = SkToU8(tstruct->tm_mon + 1); |
| 30 dt->fDayOfWeek = SkToU8(tstruct->tm_wday); | 34 dt->fDayOfWeek = SkToU8(tstruct->tm_wday); |
| 31 dt->fDay = SkToU8(tstruct->tm_mday); | 35 dt->fDay = SkToU8(tstruct->tm_mday); |
| 32 dt->fHour = SkToU8(tstruct->tm_hour); | 36 dt->fHour = SkToU8(tstruct->tm_hour); |
| 33 dt->fMinute = SkToU8(tstruct->tm_min); | 37 dt->fMinute = SkToU8(tstruct->tm_min); |
| 34 dt->fSecond = SkToU8(tstruct->tm_sec); | 38 dt->fSecond = SkToU8(tstruct->tm_sec); |
| 35 } | 39 } |
| 36 } | 40 } |
| OLD | NEW |