| Index: base/time_posix.cc
|
| diff --git a/base/time_posix.cc b/base/time_posix.cc
|
| index 39b2a7592a974be2040ac99b56e9abcd9722dabc..a2ea5ae2d5209dbefe7a7bcaea870d337939bbe3 100644
|
| --- a/base/time_posix.cc
|
| +++ b/base/time_posix.cc
|
| @@ -110,7 +110,7 @@ Time Time::FromExploded(bool is_local, const Exploded& exploded) {
|
| timestruct.tm_wday = exploded.day_of_week; // mktime/timegm ignore this
|
| timestruct.tm_yday = 0; // mktime/timegm ignore this
|
| timestruct.tm_isdst = -1; // attempt to figure it out
|
| -#if !defined(OS_NACL)
|
| +#if !defined(OS_NACL) && !defined(OS_SOLARIS)
|
| timestruct.tm_gmtoff = 0; // not a POSIX field, so mktime/timegm ignore
|
| timestruct.tm_zone = NULL; // not a POSIX field, so mktime/timegm ignore
|
| #endif
|
|
|