diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-08-15 09:50:23 +0200 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2022-10-03 12:49:55 -0500 |
| commit | f9e56732cd0cbe20a9addb77be317aa0c665dddc (patch) | |
| tree | 05ee98e96797ae83684d3967cedd758c140476ea | |
| parent | 614cfc0d1dbee554513ea345595f445e5b9ad7c1 (diff) | |
| download | ATCD-f9e56732cd0cbe20a9addb77be317aa0c665dddc.tar.gz | |
Merge pull request #1902 from likema/win-localtime-r
Fix localtime_r emulation for Windows.
(cherry picked from commit 49423535b6eabec9e681790581ed56ba4254e599)
| -rw-r--r-- | ACE/ace/OS_NS_time.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ACE/ace/OS_NS_time.cpp b/ACE/ace/OS_NS_time.cpp index 2ab3c7ebe47..ad8b188d457 100644 --- a/ACE/ace/OS_NS_time.cpp +++ b/ACE/ace/OS_NS_time.cpp @@ -253,11 +253,7 @@ ACE_OS::localtime_r (const time_t *t, struct tm *res) FileTimeToSystemTime (&localtime, &systime); res->tm_hour = systime.wHour; - - if(pTz.DaylightBias!=0) - res->tm_isdst = 1; - else - res->tm_isdst = 1; + res->tm_isdst = pTz.DaylightBias != 0; int iLeap; iLeap = (res->tm_year % 4 == 0 && (res->tm_year% 100 != 0 || res->tm_year % 400 == 0)); |