Merge 3.14 branch into 3.15

This commit is contained in:
Andrew Johnson committed 2017-06-08 09:55:05 -04:00
commit 085fab4aed
2 files changed
+3 -5

No files matched your search

+1 -3
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);
+2 -2
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