header file cleanup

bk: 4887e866gfbd2jTB_iJesVKW-XGlvg

diff --git a/ChangeLog b/ChangeLog
index d64669c154e8484d1dff6b442a41f6312507d1a5..a3d9158d262face813b51fec4aa8a81a9a1254be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* header file cleanup.
 * [Bug 1037] buffer in subroutine was 1 byte short.
 * configure.ac: cleanup, add option for wintime, and lay the groundwork
   for the changes needed for bug 1028.

diff --git a/include/Makefile.am b/include/Makefile.am
index e08267893c350d5c7814f1c0f7677efe256089e4..30ff0874c7ccb60b53e2271e3d63f360cf111138 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -38,6 +38,7 @@ noinst_HEADERS = \
        ntp_machine.h \
        ntp_malloc.h \
        ntp_md5.h \
+       ntp_net.h \
        ntp_proto.h \
        ntp_random.h \
        ntp_refclock.h \

diff --git a/include/ntp.h b/include/ntp.h
index 6922dd8393bf22123df490d11fac74dbaf4181ee..826ee247953c277576957a72a78b76bff8930d2b 100644 (file)
--- a/include/ntp.h
+++ b/include/ntp.h
@@ -4,12 +4,14 @@
 #ifndef NTP_H
 #define NTP_H
 
-#include "ntp_types.h"
 #include <math.h>
+
+#include <ntp_types.h>
 #ifdef OPENSSL
-#include "ntp_crypto.h"
+#include <ntp_crypto.h>
 #endif /* OPENSSL */
 #include <ntp_random.h>
+#include <ntp_net.h>
 
 #include <isc/boolean.h>
 #include <isc/list.h>

diff --git a/include/ntp_fp.h b/include/ntp_fp.h
index 8eb7567073b7f4e6b30bd901a6690a80f9eff793..1f83d5a36f46d81d0664c2de3b47aa10b77fcc5d 100644 (file)
--- a/include/ntp_fp.h
+++ b/include/ntp_fp.h
@@ -5,12 +5,6 @@
 #ifndef NTP_FP_H
 #define NTP_FP_H
 
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include "ntp_rfc2553.h"
-
 #include "ntp_types.h"
 
 /*

diff --git a/include/ntp_net.h b/include/ntp_net.h
new file mode 100644 (file)
index 0000000..2eaf161
--- /dev/null
+++ b/include/ntp_net.h
@@ -0,0 +1,14 @@
+/*
+ * ntp_net.h - definitions for NTP network stuff
+ */
+
+#ifndef NTP_NET_H
+#define NTP_NET_H
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+
+#include "ntp_rfc2553.h"
+
+#endif /* NTP_NET_H */

diff --git a/include/recvbuff.h b/include/recvbuff.h
index a463faef9bfa10f6ff5a535946fc3fdc36c10e0f..769b6c8ab18664f2245c0909996bf3af01c68c2e 100644 (file)
--- a/include/recvbuff.h
+++ b/include/recvbuff.h
@@ -7,7 +7,6 @@
 
 #include "ntp.h"
 #include "ntp_fp.h"
-#include "ntp_types.h"
 
 #include <isc/list.h>
 #include <isc/result.h>