aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/times.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 9b3cb02..a88c92b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2011-12-13 Dave Korn <dave.korn.cygwin@gmail.com>
+
+ * times.cc (hires_ns::resolution): Don't return less than 1.
+
2011-12-12 Christopher Faylor <me.cygwin2011@cgf.cx>
* cygthread.h (cygthread::name): Very minor formatting tweak.
diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
index 3fdab13..4f4c39c 100644
--- a/winsup/cygwin/times.cc
+++ b/winsup/cygwin/times.cc
@@ -718,7 +718,7 @@ hires_ns::resolution ()
return (long long) -1;
}
- return (LONGLONG) freq;
+ return (freq <= 1.0) ? 1LL : (LONGLONG) freq;
}
UINT