Bug 880 bug fixes for Windows build

bk: 46c26b10jOXSoIMxe8XIzF0_oXV0cA

diff --git a/ntpd/ntp_data_structures.c b/ntpd/ntp_data_structures.c
index a6539f32e6e84f539a328a25af327b89627ec5eb..05c257cd2f6424bebd9745cd7dca0fe64880c259 100644 (file)
--- a/ntpd/ntp_data_structures.c
+++ b/ntpd/ntp_data_structures.c
@@ -12,6 +12,7 @@
 
 #include <stdlib.h>    /* Needed for malloc */
 #include "ntp_data_structures.h"
+#include "ntp_stdlib.h"
 
 /* Priority Queue
  * --------------

diff --git a/ports/winnt/ntpd/nt_clockstuff.c b/ports/winnt/ntpd/nt_clockstuff.c
index bbb4c2036b0b8ab40c577241dfa2f1b7cdfcd06c..f5f393b62482a02ae6aa8883757154c6398b5ace 100644 (file)
--- a/ports/winnt/ntpd/nt_clockstuff.c
+++ b/ports/winnt/ntpd/nt_clockstuff.c
@@ -165,7 +165,7 @@ adj_systime(
 
   /* If a leap second is pending then determine the UTC time stamp 
         * of when the insertion must take place */
-       if (leap_next & LEAP_ADDSECOND)  
+       if (leap_sec > 0)  
        {
                if ( ls_ft.ull == 0 )  /* time stamp has not yet been computed */
                {