diff options
Diffstat (limited to 'package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch')
| -rw-r--r-- | package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch b/package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch new file mode 100644 index 0000000000..d69d9e2fac --- /dev/null +++ b/package/gpsd/gpsd-01-Fix-build-error-when-ntpshm-is-false.patch @@ -0,0 +1,46 @@ +From 8e081f1bd5c82b842ee317cd55e70f646ae31f05 Mon Sep 17 00:00:00 2001 +From: Simon Dawson <spdawson@gmail.com> +Date: Mon, 25 Aug 2014 10:26:11 +0100 +Subject: [PATCH] Fix build error when ntpshm is false +To: gpsd-dev@nongnu.org + +The build fails as follows + +libgpsd_core.c: In function 'ntpshm_latch': +libgpsd_core.c:1660:24: error: 'const struct gps_type_t' has no member named 'time_offset' + || device->device_type->time_offset == NULL) + ^ +libgpsd_core.c:1663:33: error: 'const struct gps_type_t' has no member named 'time_offset' + fix_time += device->device_type->time_offset(device); + ^ +scons: *** [libgpsd_core.os] Error 1 + +The solution is to wrap #ifdef NTPSHM_ENABLE around the ntpshm_latch function + +Signed-off-by: Simon Dawson <spdawson@gmail.com> +--- + libgpsd_core.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/libgpsd_core.c b/libgpsd_core.c +index 6ec08a4..f7e8075 100644 +--- a/libgpsd_core.c ++++ b/libgpsd_core.c +@@ -1638,6 +1638,7 @@ void gpsd_zero_satellites( /*@out@*/ struct gps_data_t *out) + #endif + } + ++#ifdef NTPSHM_ENABLE + void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td) + /* latch the fact that we've saved a fix */ + { +@@ -1668,5 +1669,6 @@ void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td) + device->last_fixtime.clock = td->clock.tv_sec + td->clock.tv_nsec / 1e9; + #endif /* S_SPLINT_S */ + } ++#endif /* NTPSHM_ENABLE */ + + /* end */ +-- +1.9.1 + |
