diff options
| author | Jon Schlueter <jschlueter@navigationsolutions.com> | 2015-02-18 08:49:21 -0500 |
|---|---|---|
| committer | Jon Schlueter <jschlueter@navigationsolutions.com> | 2015-02-18 08:49:21 -0500 |
| commit | 78bbe312a905c1c3f6cf86c11687a47b6f11539b (patch) | |
| tree | 9d7b7e1fcb9d9900730dbfcd71bebff2316204d1 | |
| parent | 7d4e48453d3241954a0691acfdc5b73a7a4466ae (diff) | |
| download | gpsd-78bbe312a905c1c3f6cf86c11687a47b6f11539b.tar.gz | |
Fixing broken build scons minimal=on ntpshm=on
missing ifdef guards around pps_thread_stash_fixtime()
| -rw-r--r-- | gpsd.h-tail | 2 | ||||
| -rw-r--r-- | libgpsd_core.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gpsd.h-tail b/gpsd.h-tail index 2611421d..741f58b0 100644 --- a/gpsd.h-tail +++ b/gpsd.h-tail @@ -962,8 +962,10 @@ extern void pps_early_init(struct gps_context_t *); extern void timespec_str(const struct timespec *, /*@out@*/char *, int); #define TIMESPEC_LEN 22 /* required length of a timespec buffer */ +#ifdef PPS_ENABLE extern void pps_thread_stash_fixtime(struct gps_device_t *, timestamp_t, struct timespec); +#endif /* PPS_ENABLE */ extern void pps_thread_activate(struct gps_device_t *); extern void pps_thread_deactivate(struct gps_device_t *); extern int pps_thread_lastpps(struct gps_device_t *, struct timedrift_t *); diff --git a/libgpsd_core.c b/libgpsd_core.c index 848046b8..f9eec664 100644 --- a/libgpsd_core.c +++ b/libgpsd_core.c @@ -1677,10 +1677,12 @@ void ntpshm_latch(struct gps_device_t *device, struct timedrift_t /*@out@*/*td) td->real.tv_nsec = (long)(fractional * 1e+9); /*@+type@*/ +#ifdef PPS_ENABLE /* thread-safe update */ /*@-compdef@*/ pps_thread_stash_fixtime(device, device->newdata.time, td->clock); /*@+compdef@*/ +#endif /* PPS_ENABLE */ } #endif /* NTPSHM_ENABLE */ |