From 301b65d8b134b1dbc1273848e987b73dec2bd690 Mon Sep 17 00:00:00 2001 From: Jon Schlueter Date: Mon, 12 Jan 2015 12:39:28 -0500 Subject: [PATCH 2/2] ifdef guards in gpsmon for build failure the following build was broken scons minimal=on leapfetch=off ncurses=on pps=on the build failure was due to use of json_pps_read() in gpsmon.c json_pps_read() is guarded in libgps_json.c on SOCKET_EXPORT_ENABLE gpsmon.c was checking only on PPS_ENABLE --- gpsmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpsmon.c b/gpsmon.c index 48084e5..8f4471d 100644 --- a/gpsmon.c +++ b/gpsmon.c @@ -660,7 +660,7 @@ static void gpsmon_hook(struct gps_device_t *device, gps_mask_t changed UNUSED) struct timedrift_t td; #endif /* NTPSHM_ENABLE */ -#ifdef PPS_ENABLE +#if defined(PPS_ENABLE) && defined(SOCKET_EXPORT_ENABLE) if (!serial && strncmp((char*)device->lexer.outbuffer, "{\"class\":\"PPS\",", 13) == 0) { const char *end = NULL; -- 2.0.4