Merge lp://qastaging/~epics-core/epics-base/tzwin32 into lp://qastaging/~epics-core/epics-base/3.14
Proposed by
mdavidsaver
Status: | Merged |
---|---|
Merged at revision: | 12607 |
Proposed branch: | lp://qastaging/~epics-core/epics-base/tzwin32 |
Merge into: | lp://qastaging/~epics-core/epics-base/3.14 |
Diff against target: |
305 lines (+137/-133) 3 files modified
src/libCom/osi/os/WIN32/osdTime.cpp (+16/-133) src/libCom/test/Makefile (+4/-0) src/libCom/test/epicsTimeZoneTest.c (+117/-0) |
To merge this branch: | bzr merge lp://qastaging/~epics-core/epics-base/tzwin32 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Johnson | Approve | ||
mdavidsaver | Needs Information | ||
Review via email: mp+281122@code.qastaging.launchpad.net |
Description of the change
osdTime: win32 use C89 localtime/gmtime
as recommended by Freddie Akeroyd
To post a comment you must log in.
These changes are reported to fix the issue. I've verified with cross-mingw/wine, which also needs to link against -lwinpthread. This change almost falls below the threshold were I wouldn't bother with a merge proposal, but as I don't do much work with win32 I'd like to get it checked/tested by someone who does.
http:// www.aps. anl.gov/ epics/tech- talk/2015/ msg01660. php