ChangeLog, ntp_refclock.c:

  * ntpd/ntp_refclock.c: HAVE_PPSAPI header cleanup
  From: Reg Clemens <reg@dwf.com>

bk: 386ef394DQB-Y1eBABlWSZ1MuLnlLQ

diff --git a/ChangeLog b/ChangeLog
index 36abc6b057863dd0ad1bcbe8eb28be9043512fc9..e9e37a3427af291999f6bff9e9e178d1062a6606 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-01-02  Harlan Stenn  <stenn@whimsy.udel.edu>
+
+       * ntpd/ntp_refclock.c: HAVE_PPSAPI header cleanup
+       From: Reg Clemens <reg@dwf.com>
+
 2000-01-01  Harlan Stenn  <stenn@whimsy.udel.edu>
 
        * configure.in (CLOCK_WWV): Require <sys/audioio.h> or <sun/audioio.h>

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 679a2b40c777f8c1bcd237875a8732de7c79e5a1..c47031cca70f4f005ba194c0fcbae8869102aab2 100644 (file)
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -33,7 +33,13 @@
 #endif /* HAVE_PPSCLOCK_H */
 
 #ifdef HAVE_PPSAPI
-#include <sys/timepps.h>
+# ifdef HAVE_TIMEPPS_H
+#  include <timepps.h>
+# else
+#  ifdef HAVE_SYS_TIMEPPS_H
+#   include <sys/timepps.h>
+#  endif
+# endif
 #endif /* HAVE_PPSAPI */
 
 /*