ppsapi header cleanup

bk: 41bbbaf1IxQHpOyfygAil0jxek8tzA

diff --git a/ntpd/refclock_jupiter.c b/ntpd/refclock_jupiter.c
index cda655094c158254b748a84b02fd4d04b1466859..6aad0952f26944ed10bbf73e233b6302a382f198 100644 (file)
--- a/ntpd/refclock_jupiter.c
+++ b/ntpd/refclock_jupiter.c
@@ -48,7 +48,9 @@
 
 #include "jupiter.h"
 
-#include "ppsapi_timepps.h"
+#ifdef HAVE_PPSAPI
+# include "ppsapi_timepps.h"
+#endif
 
 #ifdef XNTP_BIG_ENDIAN
 #define getshort(s) ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff))

diff --git a/ntpd/refclock_mx4200.c b/ntpd/refclock_mx4200.c
index 22e7dcf108ab9d6e14d41369653f55d367d0a5fe..e2f2d13715e23483a51be29e38c3cd12889b763e 100644 (file)
--- a/ntpd/refclock_mx4200.c
+++ b/ntpd/refclock_mx4200.c
@@ -80,13 +80,9 @@ struct ppsclockev {
 };
 #endif /* ! HAVE_STRUCT_PPSCLOCKEV */
 
-#ifdef HAVE_TIMEPPS_H
-#   include <timepps.h>
-#else
-# ifdef HAVE_SYS_TIMEPPS_H
-#   include <sys/timepps.h>
-# endif
-#endif
+#ifdef HAVE_PPSAPI
+# include "ppsapi_timepps.h"
+#endif /* HAVE_PPSAPI */
 
 /*
  * This driver supports the Magnavox Model MX 4200 GPS Receiver

diff --git a/ntpd/refclock_nmea.c b/ntpd/refclock_nmea.c
index e602b0aff91c6f8873a61e98d771a0be79131828..5b124cb0c3f4637647eca852f45cd08e5b84b2cc 100644 (file)
--- a/ntpd/refclock_nmea.c
+++ b/ntpd/refclock_nmea.c
@@ -24,13 +24,7 @@
 #include "ntp_stdlib.h"
 
 #ifdef HAVE_PPSAPI
-# ifdef HAVE_TIMEPPS_H
-#  include <timepps.h>
-# else
-#  ifdef HAVE_SYS_TIMEPPS_H
-#   include <sys/timepps.h>
-#  endif
-# endif
+# include "ppsapi_timepps.h"
 #endif /* HAVE_PPSAPI */
 
 /*

diff --git a/ntpd/refclock_oncore.c b/ntpd/refclock_oncore.c
index 0b6544f1d8b7965c607778628101d8bab79a4c57..8625a3ebf5e1e1a126f1dc74993c9742c6d72368 100644 (file)
--- a/ntpd/refclock_oncore.c
+++ b/ntpd/refclock_oncore.c
@@ -109,7 +109,9 @@
 # endif /* HAVE_SYS_MMAN_H */
 #endif /* ONCORE_SHMEM_STATUS */
 
-#include "ppsapi_timepps.h"
+#ifdef HAVE_PPSAPI
+# include "ppsapi_timepps.h"
+#endif
 
 #ifdef HAVE_SYS_SIO_H
 # include <sys/sio.h>

diff --git a/ntpd/refclock_parse.c b/ntpd/refclock_parse.c
index 0093f8bbcb25d157ffec3861aad0018dba3f6911..ca22a1cf34ad8666d038948a92770e28dac997f4 100644 (file)
--- a/ntpd/refclock_parse.c
+++ b/ntpd/refclock_parse.c
@@ -133,7 +133,9 @@
 # include <sys/ioctl.h>
 #endif
 
-#include "ppsapi_timepps.h"
+#ifdef HAVE_PPSAPI
+# include "ppsapi_timepps.h"
+#endif
 
 #ifdef PPS
 # ifdef HAVE_SYS_PPSCLOCK_H

diff --git a/ntpd/refclock_ripencc.c b/ntpd/refclock_ripencc.c
index 2aa4718536aecef03bb6949e264ec8806586290b..d9fa2044cd5160170ba0c9884f8186b98820a049 100644 (file)
--- a/ntpd/refclock_ripencc.c
+++ b/ntpd/refclock_ripencc.c
@@ -44,7 +44,9 @@
 #include "ntp_unixtime.h"
 #include "ntp_io.h"
 
-#include "ppsapi_timepps.h"
+#ifdef HAVE_PPSAPI
+# include "ppsapi_timepps.h"
+#endif
 
 /*
  * Definitions