epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge 3.14 branch into 3.15

Browse Source
This commit is contained in:
Andrew Johnson
2017-06-08 09:55:05 -04:00
parent 1293747cf3 c853234e01
commit 085fab4aed
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libCom/osi/os/Darwin/osdTime.cpp
View File

@@ -69,10 +69,8 @@ convertDoubleToWakeTime(double timeout, struct timespec *wakeTime)
clock_get_time(host_clock, &now);
if (timeout<0.0)
if (timeout < 0.0)
timeout = 0.0;
else if(timeout>3600.0)
timeout = 3600.0;
wait.tv_sec = static_cast< long >(timeout);
wait.tv_nsec = static_cast< long >((timeout - (double)wait.tv_sec) * 1e9);

4
src/libCom/osi/os/posix/osdTime.cpp
View File

@@ -90,8 +90,8 @@ extern "C" epicsShareFunc void
struct timespec wait;
int status;
if(timeout<0.0) timeout = 0.0;
else if(timeout>3600.0) timeout = 3600.0;
if (timeout < 0.0)
timeout = 0.0;
#ifdef CLOCK_REALTIME
status = clock_gettime(CLOCK_REALTIME, wakeTime);
#else