From 9d0597fc1509363ee34876f4c2cd37667bc2251c Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sun, 21 Feb 2021 12:04:07 -0600 Subject: [PATCH] Fix MS compiler issue that I introduced into Freddie's code Plus a little more code simplification. --- modules/libcom/src/osi/os/WIN32/osdMonotonic.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/libcom/src/osi/os/WIN32/osdMonotonic.c b/modules/libcom/src/osi/os/WIN32/osdMonotonic.c index e2d4f92ff..cff18d0e6 100644 --- a/modules/libcom/src/osi/os/WIN32/osdMonotonic.c +++ b/modules/libcom/src/osi/os/WIN32/osdMonotonic.c @@ -46,13 +46,11 @@ epicsUInt64 epicsMonotonicResolution(void) epicsUInt64 epicsMonotonicGet(void) { LARGE_INTEGER val; + double dval; if (!QueryPerformanceCounter(&val)) { cantProceed("epicsMonotonicGet: Failed to read Windows Performance Counter\n"); return 0; } - else { /* return value in nanoseconds */ - val.QuadPart -= perfCounterOffset; - double nsec = (double)(val.QuadPart) * sec2nsec / perfCounterFrequency; - return (epicsUInt64)(nsec + 0.5); - } + dval = val.QuadPart - perfCounterOffset; + return (epicsUInt64)(dval * sec2nsec / perfCounterFrequency + 0.5); }