[Bug 2576] refclock_gpsdjson.c doesn't compile if CLOCK_GPSDJSON is not enabled at...

bk: 53143079t0L2avC2AhQk0IjMfeVz9g

diff --git a/ChangeLog b/ChangeLog
index bad6390bea869be76b744c3d3a14d7c163370027..ff526fa520c198e74644e8dc604d3ce0469804f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 * CID 1165098: Remove logically dead code from refclock_true.c.
 * In ntp_dir_sep.m4, we care about $host_os, not $target_os.
 * [Bug 2540] bootstrap script needs to 'touch' files in finer-grained groups.
+* [Bug 2576] refclock_gpsdjson.c doesn't compile if CLOCK_GPSDJSON is
+  not enabled at configure time.
 (4.2.7p428) 2014/03/03 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2570] refuse to load leapsec file with bad/missing SHA1 hash
 * [Bug 2562] Distribute the code in libjsmn/ .

diff --git a/ntpd/refclock_gpsdjson.c b/ntpd/refclock_gpsdjson.c
index 75650a56721aa5dbf764f2496a8e84b510e507a7..659a6e81a7aad43928592fb3583bee8eea40e63a 100644 (file)
--- a/ntpd/refclock_gpsdjson.c
+++ b/ntpd/refclock_gpsdjson.c
@@ -26,6 +26,8 @@
 #include <config.h>
 #endif
 
+#include "ntp_types.h"
+
 #if defined(REFCLOCK) && defined(CLOCK_GPSDJSON) && !defined(SYS_WINNT) 
 
 /* =====================================================================
@@ -54,7 +56,6 @@
 # error need poll() or select()
 #endif
 
-#include "ntp_types.h"
 #include "ntpd.h"
 #include "ntp_io.h"
 #include "ntp_unixtime.h"