Cleanup for prior merge cset

bk: 4d618595XshVi8k8up3xh89qn86qfg

diff --git a/include/ntp_machine.h b/include/ntp_machine.h
index 6fa7412b5a348d757459a0e5e1d2c6c2b917a89f..3845e3e57e5f1764c7ad7780a52c73475f5b0198 100644 (file)
--- a/include/ntp_machine.h
+++ b/include/ntp_machine.h
@@ -10,7 +10,11 @@
 #ifndef NTP_MACHINE_H
 #define NTP_MACHINE_H
 
-#include "ntp_unixtime.h"
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#include <time.h>
+
 #include "ntp_proto.h"
 
 /*

diff --git a/include/ntp_unixtime.h b/include/ntp_unixtime.h
index 39ad945e3acef8d871439c68e901b05c82744d4d..5d4da54ad4a6e8df1565fa9b2b1377885c478804 100644 (file)
--- a/include/ntp_unixtime.h
+++ b/include/ntp_unixtime.h
@@ -6,12 +6,7 @@
 #ifndef NTP_UNIXTIME_H
 #define NTP_UNIXTIME_H
 
-#ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#include <time.h>
-
-#include "ntp_types.h"
+#include "ntp_types.h" /* picks up time.h via ntp_machine.h */
 
 #ifdef SIM
 #   define GETTIMEOFDAY(a, b) (node_gettime(&ntp_node, a))

diff --git a/libntp/systime.c b/libntp/systime.c
index 67176ae92440b40ee676529f75337656c88c0c65..4ff0c0e1f554a2e80e713a41b0786bc43aa6e9b3 100644 (file)
--- a/libntp/systime.c
+++ b/libntp/systime.c
@@ -5,8 +5,8 @@
  *
  */
 #include <config.h>
-#include "ntp_machine.h"
-#include "ntp_fp.h"
+
+#include "ntp.h"
 #include "ntp_syslog.h"
 #include "ntp_unixtime.h"
 #include "ntp_stdlib.h"

diff --git a/ports/winnt/libntp/SetSystemTime.c b/ports/winnt/libntp/SetSystemTime.c
index dac30c2ab8a37eec3049f79db291ebffe3bdde35..457f8440f11e40ae3061c2262535029cd4269aa6 100644 (file)
--- a/ports/winnt/libntp/SetSystemTime.c
+++ b/ports/winnt/libntp/SetSystemTime.c
@@ -1,7 +1,9 @@
 
 #include <config.h>
+
 #include "clockstuff.h"
 #include "ntp_stdlib.h"
+#include "ntp_unixtime.h"
 
 pset_tod_using         set_tod_using = NULL;
 

diff --git a/ports/winnt/libntp/getclock.c b/ports/winnt/libntp/getclock.c
index a53a5c94eeb8a6df39f598d6e38a1114dd95415d..c5666dfc36ec136c0ca5f3829e4dce004cb9c0b3 100644 (file)
--- a/ports/winnt/libntp/getclock.c
+++ b/ports/winnt/libntp/getclock.c
@@ -2,6 +2,8 @@
  * getclock.c - Emulate Unix getclock(3) nanosecond interface for libntp/ntpd
  */
 #include "config.h"
+
+#include "ntp_unixtime.h"
 #include "clockstuff.h"
 #include "ntp_stdlib.h"
 

diff --git a/ports/winnt/libntp/util_clockstuff.c b/ports/winnt/libntp/util_clockstuff.c
index 3b1dc39c829981bf43aab2019ea8dce85ec87c73..141c45b300bb21873c1b650e6d0f67dade0dc172 100644 (file)
--- a/ports/winnt/libntp/util_clockstuff.c
+++ b/ports/winnt/libntp/util_clockstuff.c
@@ -4,6 +4,7 @@
 
 #include "ntp_syslog.h"
 #include "ntp_stdlib.h"
+#include "ntp_unixtime.h"
 #include "clockstuff.h"
 
 int

diff --git a/util/ntp-keygen.c b/util/ntp-keygen.c
index 516a8e96a7c42fd7b5bbed81670970969292dbeb..b0ed88c7a1056d090b2a0d29bdb39f04b076da5f 100644 (file)
--- a/util/ntp-keygen.c
+++ b/util/ntp-keygen.c
@@ -88,12 +88,12 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include "ntp_types.h"
+
 #include "ntp_random.h"
 #include "ntp_stdlib.h"
 #include "ntp_assert.h"
-
 #include "ntp_libopts.h"
+#include "ntp_unixtime.h"
 #include "ntp-keygen-opts.h"
 
 #ifdef OPENSSL