AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Remove dependency on _mkgmtime to determine local timezone offset

Browse Source 
BUGS=v8:1386
TEST=

Review URL: https://chromiumcodereview.appspot.com/9600018
Patch from Jonathan Liu <net147@gmail.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11148 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
ulan@chromium.org 2012-03-27 08:46:32 +00:00
parent bfb1e9e702
commit 7a1cbb2db8
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/platform-win32.cc
View File

@ -66,16 +66,8 @@ int fopen_s(FILE** pFile, const char* filename, const char* mode) {
#ifndef __MINGW64_VERSION_MAJOR
// Not sure this the correct interpretation of _mkgmtime
time_t _mkgmtime(tm* timeptr) {
return mktime(timeptr);
}
#define _TRUNCATE 0
#define STRUNCATE 80
#endif // __MINGW64_VERSION_MAJOR
@ -511,11 +503,14 @@ int64_t Time::LocalOffset() {
// Convert to local time, as struct with fields for day, hour, year, etc.
tm posix_local_time_struct;
if (localtime_s(&posix_local_time_struct, &posix_time)) return 0;
// Convert local time in struct to POSIX time as if it were a UTC time.
time_t local_posix_time = _mkgmtime(&posix_local_time_struct);
Time localtime(1000.0 * local_posix_time);
return localtime.Diff(&rounded_to_second);
if (posix_local_time_struct.tm_isdst > 0) {
return (tzinfo_.Bias + tzinfo_.DaylightBias) * -kMsPerMinute;
} else if (posix_local_time_struct.tm_isdst == 0) {
return (tzinfo_.Bias + tzinfo_.StandardBias) * -kMsPerMinute;
} else {
return tzinfo_.Bias * -kMsPerMinute;
}
}