bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

auto merge of #8913 : poiru/rust/issue-8702, r=cmr

Browse source 
Closes #8702.
This commit is contained in:
bors 2013-09-01 08:50:44 -07:00
commit c70486fffe
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/rt/rust_builtin.cpp
View file

@ -321,13 +321,16 @@ rust_localtime(int64_t sec, int32_t nsec, rust_tm *timeptr) {
time_t s = sec;
LOCALTIME(&s, &tm);
const char* zone = NULL;
#if defined(__WIN32__)
int32_t gmtoff = -timezone;
char zone[64];
strftime(zone, sizeof(zone), "%Z", &tm);
char buffer[64];
if (strftime(buffer, sizeof(buffer), "%Z", &tm) > 0) {
zone = buffer;
}
#else
int32_t gmtoff = tm.tm_gmtoff;
const char *zone = tm.tm_zone;
zone = tm.tm_zone;
#endif
tm_to_rust_tm(&tm, timeptr, gmtoff, zone, nsec);