diff options
| author | Simon Dawson <spdawson@gmail.com> | 2013-12-08 10:31:25 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2014-01-03 04:58:41 -0500 |
| commit | c31095e1562494a74d56b46fcc01541d1444cd5c (patch) | |
| tree | e640d21b693794a782d8b2372ffce54d35d69482 /gpsmon.c | |
| parent | 182454be8b437296350a57d85f51698d313d5c3e (diff) | |
| download | gpsd-c31095e1562494a74d56b46fcc01541d1444cd5c.tar.gz | |
gpsmon: fix build when nmea is false
When nmea is False and ncurses support is enabled, the build fails as
follows.
gpsmon.o: In function `gpsmon_hook':
gpsmon.c:(.text+0x974): undefined reference to `driver_nmea0183'
collect2: error: ld returned 1 exit status
scons: *** [gpsmon] Error 1
scons: building terminated because of errors.
The problem appears to be a failure to protect use of the driver_nmea0183
variable with appropriate #ifdef guards.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Eric S. Raymond <esr@thyrsus.com>
Diffstat (limited to 'gpsmon.c')
| -rw-r--r-- | gpsmon.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -36,7 +36,9 @@ extern struct monitor_object_t garmin_mmt, garmin_bin_ser_mmt; extern struct monitor_object_t italk_mmt, ubx_mmt, superstar2_mmt; extern struct monitor_object_t fv18_mmt, gpsclock_mmt, mtk3301_mmt; extern struct monitor_object_t oncore_mmt, tnt_mmt, aivdm_mmt; +#ifdef NMEA_ENABLE extern const struct gps_type_t driver_nmea0183; +#endif /* NMEA_ENABLE */ /* These are public */ struct gps_device_t session; @@ -477,9 +479,11 @@ static void select_packet_monitor(struct gps_device_t *device) */ if (device->packet.type != last_type) { const struct gps_type_t *active_type = device->device_type; +#ifdef NMEA_ENABLE if (device->packet.type == NMEA_PACKET && ((device->device_type->flags & DRIVER_STICKY) != 0)) active_type = &driver_nmea0183; +#endif /* NMEA_ENABLE */ if (!switch_type(active_type)) longjmp(terminate, TERM_DRIVER_SWITCH); else { |