From: Danny Mayer <mayer@ntp.org>
Date: Wed, 15 Aug 2007 02:55:12 +0000 (-0400)
Subject: Bug 880 bug fixes for Windows build
X-Git-Tag: NTP_4_2_5P70~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d5cc7988479f3a8e3e2c78501e90e6a50f2c8d9;p=thirdparty%2Fntp.git

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 a6539f32e..05c257cd2 100644
--- 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 bbb4c2036..f5f393b62 100644
--- 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 */
 		{