From: Dave Hart <hart@ntp.org>
Date: Sun, 20 Feb 2011 21:20:21 +0000 (+0000)
Subject: Cleanup for prior merge cset
X-Git-Tag: NTP_4_2_7P131~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad3a85356261696a2acab9a19dab9bc987de4b74;p=thirdparty%2Fntp.git

Cleanup for prior merge cset

bk: 4d618595XshVi8k8up3xh89qn86qfg
---

diff --git a/include/ntp_machine.h b/include/ntp_machine.h
index 6fa7412b5..3845e3e57 100644
--- 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 39ad945e3..5d4da54ad 100644
--- 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 67176ae92..4ff0c0e1f 100644
--- 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 dac30c2ab..457f8440f 100644
--- 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 a53a5c94e..c5666dfc3 100644
--- 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 3b1dc39c8..141c45b30 100644
--- 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 516a8e96a..b0ed88c7a 100644
--- 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