Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix localtime_r for VxWorks 6.9 and later #3274

Closed
wants to merge 11 commits into from
Closed

Fix localtime_r for VxWorks 6.9 and later #3274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8b68e90
Fix localtime_r call for vxworks 6.9 and later
okkenator Apr 9, 2021
6c7eb5a
Fix for VxWorks 6.9 and later posix localtime_r
okkenator Apr 9, 2021
2a1c11e
Fix localtime_r for vxworks
okkenator May 13, 2021
130d2e9
Fix localtime_r for vxworks 6.9 and later
okkenator May 17, 2021
fda4bdf
Fix localtime_r for vxworks 6.9 and later
okkenator May 17, 2021
0588ac6
Fix localtime_r for vxworks 6.9 and later
okkenator May 17, 2021
5ab803c
Update LocalDateTime.cpp
okkenator May 17, 2021
33811e4
Fix localtime_r for VxWorks 6.9 and later
okkenator May 17, 2021
2f504c2
Fix localtime_r for VxWorks 6.9 and later
okkenator May 17, 2021
a6addca
Fix localtime_r for VxWorks 6.9 and later
okkenator May 18, 2021
754fabf
Fix localtime_r for VxWorks 6.9 and later
okkenator May 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Foundation/src/LocalDateTime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ void LocalDateTime::determineTzd(bool adjust)
_tzd = (Timezone::utcOffset() + ((broken->tm_isdst == 1) ? 3600 : 0));
#else
std::tm broken;
#if defined(POCO_VXWORKS)
#if defined(POCO_VXWORKS) && (defined(_VXWORKS_COMPATIBILITY_MODE) || (defined(_WRS_VXWORKS_MAJOR) && ((_WRS_VXWORKS_MAJOR < 6) || ((_WRS_VXWORKS_MAJOR == 6) && (_WRS_VXWORKS_MINOR < 9)))))
if (localtime_r(&epochTime, &broken) != OK)
throw Poco::SystemException("cannot get local time");
#else
Expand All @@ -280,6 +280,7 @@ void LocalDateTime::determineTzd(bool adjust)
_tzd = (Timezone::utcOffset() + ((broken.tm_isdst == 1) ? 3600 : 0));
#endif
adjustForTzd();

}
else
{
Expand Down
4 changes: 4 additions & 0 deletions Foundation/src/Timezone_VX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ int Timezone::dst()
{
std::time_t now = std::time(NULL);
struct std::tm t;
#if defined(_VXWORKS_COMPATIBILITY_MODE) || (defined(_WRS_VXWORKS_MAJOR) && ((_WRS_VXWORKS_MAJOR < 6) || ((_WRS_VXWORKS_MAJOR == 6) && (_WRS_VXWORKS_MINOR < 9))))
if (localtime_r(&now, &t) != OK)
#else
if (!localtime_r(&now, &t))
#endif
throw Poco::SystemException("cannot get local time DST offset");
return t.tm_isdst == 1 ? 3600 : 0;
}
Expand Down