aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/times.cc2
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6111d7f..a010a3a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-12 Christopher Faylor <cgf@timesys.com>
+
+ * times.cc (hires_ms::usecs): Subtract from slop from system time or
+ we'll always end up priming the pump.
+
2005-12-12 Nick Duffek <nick@duffek.com>
* times.cc (systime): Correct precision referenced in comment.
diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc
index 4820454..ba387bf 100644
--- a/winsup/cygwin/times.cc
+++ b/winsup/cygwin/times.cc
@@ -644,7 +644,7 @@ hires_ms::usecs ()
LONGLONG t = systime ();
LONGLONG res = initime_us + (((LONGLONG) timeGetTime ()) * 1000LL);
- if (res < t)
+ if (res < (t - 40000LL))
{
inited = false;
prime ();