From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 3 Mar 2014 07:34:17 +0000 (-0500)
Subject: [Bug 2576] refclock_gpsdjson.c doesn't compile if CLOCK_GPSDJSON is not enabled at... 
X-Git-Tag: NTP_4_2_7P429~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea40bd4aa80c8a9b7c3c022416a229c5889b66a4;p=thirdparty%2Fntp.git

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

bk: 53143079t0L2avC2AhQk0IjMfeVz9g
---

diff --git a/ChangeLog b/ChangeLog
index bad6390be..ff526fa52 100644
--- 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 75650a567..659a6e81a 100644
--- 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"