merging
authorVolker Birk <vb@pep-project.org>
Wed, 29 Jul 2020 16:05:33 +0200
changeset 10298918f1baa6e5
parent 1028 ff4ea2c3043d
parent 1027 56414b64b06e
child 1030 a52221d0d778
merging
     1.1 --- a/server/inout.cc	Wed Jul 29 16:05:13 2020 +0200
     1.2 +++ b/server/inout.cc	Wed Jul 29 16:05:33 2020 +0200
     1.3 @@ -169,10 +169,7 @@
     1.4  		return js::Value{};
     1.5  	}
     1.6  	
     1.7 -	// neither timegm() nor mktime() respect t->tm_gmtoff for their conversions. What a mess!
     1.8 -	// But t->tm_gmtoff is non-standard, though, and doesn't exist on MS Windows. In ENGINE-735
     1.9 -	// we switched to `timestamp` to cater for Windows and now convert to UTC in Windows' `timegm`.
    1.10 -	const int64_t u = timegm(t);
    1.11 +	const int64_t u = timegm_with_gmtoff(t);
    1.12  	return js::Value{u};
    1.13  }
    1.14