ntpdc_ops.c:

  undo all of the changes to the header include order as some systems in the flock had trouble with the reordering
ntpdc_ops.c, ntp_intres.c:
  Undo some of the reordering of includes
Many files:
  reorder includes to make sure that the AI_* macros don't get defined before the system has a chance to define them
ntp_fp.h:
  change inclusion order of netinet/in.h and ntp_rfc2553.h

bk: 406c7a3azhe-U-fwryp9tOLyGT1H3w

diff --git a/include/ntp_fp.h b/include/ntp_fp.h
index 40bfb1e371651f0b9d8d62e21cf5f2ca8e44c26f..8312f354e7f9b2ffbdfe172fe6a726e1b3d791d8 100644 (file)
--- a/include/ntp_fp.h
+++ b/include/ntp_fp.h
@@ -7,8 +7,8 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include "ntp_rfc2553.h"
 #include <netinet/in.h>
+#include "ntp_rfc2553.h"
 
 #include "ntp_types.h"
 

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index a870e212e3155e6e0dfb0ebdf9ae231b5a7e5818..7115839979ffcd4a4ddfde2a2d0d0aa521a4b40a 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -9,6 +9,8 @@
 # include <netinfo/ni.h>
 #endif
 
+#include <netdb.h>
+
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
@@ -38,8 +40,6 @@
 extern HANDLE ResolverThreadHandle;
 #endif /* SYS_WINNT */
 
-#include <netdb.h>
-
 extern int priority_done;
 
 /*
@@ -342,6 +342,7 @@ static char res_file[MAX_PATH];
 char const *progname;
 char   sys_phone[MAXPHONE][MAXDIAL]; /* ACTS phone numbers */
 char   *keysdir = NTP_KEYSDIR; /* crypto keys directory */
+char   pps_device[MAXPPS + 1]; /* PPS device name */
 #if defined(HAVE_SCHED_SETSCHEDULER)
 int    config_priority_override = 0;
 int    config_priority;

diff --git a/ntpd/ntp_intres.c b/ntpd/ntp_intres.c
index 1af16f18c4154f355db76938e7517ee5a6a2e944..47d521874ec9cfeedee0ebbfaf36b656531fd369 100644 (file)
--- a/ntpd/ntp_intres.c
+++ b/ntpd/ntp_intres.c
@@ -20,6 +20,8 @@
 # include <config.h>
 #endif
 
+#include <netdb.h>
+
 #include "ntp_machine.h"
 #include "ntpd.h"
 #include "ntp_io.h"
@@ -29,7 +31,6 @@
 
 #include <stdio.h>
 #include <ctype.h>
-#include <netdb.h>
 #include <signal.h>
 
 /**/

diff --git a/ntpd/ntp_resolver.c b/ntpd/ntp_resolver.c
index a427a3d5b8d2f712172ca89497d9460b640da890..c3fb46663d3c6a6c1b0c5616fe8526428f913c73 100644 (file)
--- a/ntpd/ntp_resolver.c
+++ b/ntpd/ntp_resolver.c
@@ -42,13 +42,6 @@
 # include <config.h>
 #endif
 
-#include "ntp_machine.h"
-#include "ntpd.h"
-#include "ntp_io.h"
-#include "ntp_request.h"
-#include "ntp_stdlib.h"
-#include "ntp_syslog.h"
-
 #include <stdio.h>
 #include <ctype.h>
 #include <netdb.h>
@@ -57,6 +50,13 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include "ntp_machine.h"
+#include "ntpd.h"
+#include "ntp_io.h"
+#include "ntp_request.h"
+#include "ntp_stdlib.h"
+#include "ntp_syslog.h"
+
 #define        STREQ(a, b)     (*(a) == *(b) && strcmp((a), (b)) == 0)
 
 /*

diff --git a/ntpd/refclock_nmea.c b/ntpd/refclock_nmea.c
index c1abcce6d5f2f9221c5b823cb69a5963ace48184..a722b351b085c2c38cd6a9a6ec309e5d8cc912d0 100644 (file)
--- a/ntpd/refclock_nmea.c
+++ b/ntpd/refclock_nmea.c
@@ -14,17 +14,17 @@
 
 #if defined(REFCLOCK) && defined(CLOCK_NMEA)
 
+#include <stdio.h>
+#include <ctype.h>
+
+#include <netdb.h>
+
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"
 #include "ntp_refclock.h"
 #include "ntp_stdlib.h"
 
-#include <stdio.h>
-#include <ctype.h>
-
-#include <netdb.h>
-
 #ifdef HAVE_PPSAPI
 # ifdef HAVE_TIMEPPS_H
 #  include <timepps.h>

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index b7f36841113d56ad3d9a914296c8a32a8ff2cb01..130b11d9273cf222257d25d36f855f5c53d2ffc8 100644 (file)
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -4,6 +4,11 @@
 
 #include <stdio.h>
 
+#include <ctype.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <netdb.h>
+
 #include "ntpdc.h"
 #include "ntp_select.h"
 #include "ntp_io.h"
@@ -13,11 +18,6 @@
 #include "isc/net.h"
 #include "isc/result.h"
 
-#include <ctype.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <netdb.h>
-
 #ifdef SYS_WINNT
 # include <io.h>
 #else

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index cbb628315182491821cf4c3dd0b319777090954d..f92b6b6debacb18894e9dc3739c53f3f60f96bb5 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -4,6 +4,13 @@
 
 #include <stdio.h>
 
+#include <ctype.h>
+#include <signal.h>
+#include <setjmp.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <netdb.h>
+
 #include "ntpq.h"
 #include "ntp_unixtime.h"
 #include "ntp_calendar.h"
@@ -15,12 +22,6 @@
 #include "isc/net.h"
 #include "isc/result.h"
 
-#include <ctype.h>
-#include <signal.h>
-#include <setjmp.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <netdb.h>
 #ifdef SYS_WINNT
 # include <io.h>
 #else