From 84edd2438b718f0617bf1adb3723a463070cbd7b Mon Sep 17 00:00:00 2001 From: Richard Basch Date: Tue, 18 Feb 1997 05:40:06 +0000 Subject: [PATCH] Fixed the microsecond adjustment for Windows git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9882 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/os/ChangeLog | 4 ++++ src/lib/crypto/os/c_ustime.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog index b0b44f160..26dc9d416 100644 --- a/src/lib/crypto/os/ChangeLog +++ b/src/lib/crypto/os/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 17 17:24:41 1997 Richard Basch + + * c_ustime.c: Fixed microsecond adjustment code (win32) + Thu Nov 21 00:58:04 EST 1996 Richard Basch * Makefile.in: Win32 build diff --git a/src/lib/crypto/os/c_ustime.c b/src/lib/crypto/os/c_ustime.c index 57606de10..350c1aa5c 100644 --- a/src/lib/crypto/os/c_ustime.c +++ b/src/lib/crypto/os/c_ustime.c @@ -141,10 +141,10 @@ register krb5_int32 *seconds, *microseconds; _ftime(&timeptr); /* Get the current time */ sec = timeptr.time; - usec = timeptr.millitm; + usec = timeptr.millitm * 1000; - if (sec == last_sec) { /* Same as last time??? */ - usec = ++last_usec; /* Yep, so do microseconds */ + if ((sec == last_sec) && (usec <= last_usec)) { /* Same as last time??? */ + usec = ++last_usec; if (usec >= 1000000) { ++sec; usec = 0; -- 2.26.2