[Bug 2732] - Leap second not handled correctly on Windows 8

  use 'GetTickCount()' to get the true elapsed time of slew
 (This should work for all versions of Windows >= W2K)

bk: 54c6c2ddC82s-XbFpGRoEgyY4h7Jmg

diff --git a/ChangeLog b/ChangeLog
index f7b394557603b9edc080388b81f4ded21b1712fe..59fc4b079745e62289a895a1c306ca06dc6e3d27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
 ---
+* [Bug 2732] - Leap second not handled correctly on Windows 8
+  use 'GetTickCount()' to get the true elapsed time of slew
+  (This should work for all versions of Windows >= W2K)
+---
 (4.2.8p1-beta5) 2015/01/07 Released by Harlan Stenn <stenn@ntp.org>
 
 * [Bug 2728] Work around C99-style structure initialization code

diff --git a/ports/winnt/ntpd/nt_clockstuff.c b/ports/winnt/ntpd/nt_clockstuff.c
index a69c268969e4950b0c5eed0f33ed0cf68b86c542..e15624cf57f69e55280ef9cdd6aa2f3a75e9a74e 100644 (file)
--- a/ports/winnt/ntpd/nt_clockstuff.c
+++ b/ports/winnt/ntpd/nt_clockstuff.c
@@ -556,7 +556,7 @@ adj_systime(
                                /* slew starts with last second before insertion!
                                 * And we have to tell the core that we deal with it.
                                 */
-                                ls_ft.ull -= HECTONANOSECONDS;
+                                ls_ft.ull -= (HECTONANOSECONDS + HECTONANOSECONDS/2);
                                 leapsec_electric(TRUE);
                         } else if (lsi.tai_diff < 0) {
                                 /* Do not handle negative leap seconds here. If this