diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2015-10-01 20:37:28 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2015-10-01 20:37:28 -0400 |
| commit | 3e25e2167beb3936de3986fad9b6c9bdec82b81f (patch) | |
| tree | 0dba43b0010c999f403faea1d30bff8321c915fe /gpsmon.c | |
| parent | a0fae4291e463f81575d7126ef498a10392f43b5 (diff) | |
| download | gpsd-3e25e2167beb3936de3986fad9b6c9bdec82b81f.tar.gz | |
Address Savannah bug #46082 - Can't explicitly build with NMEA drivers.
Diffstat (limited to 'gpsmon.c')
| -rw-r--r-- | gpsmon.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -39,9 +39,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 +#ifdef NMEA0183_ENABLE extern const struct gps_type_t driver_nmea0183; -#endif /* NMEA_ENABLE */ +#endif /* NMEA0183_ENABLE */ /* These are public */ struct gps_device_t session; @@ -76,11 +76,11 @@ const struct monitor_object_t json_mmt = { #endif /* PASSTHROUGH_ENABLE */ static const struct monitor_object_t *monitor_objects[] = { -#ifdef NMEA_ENABLE +#ifdef NMEA0183_ENABLE &nmea_mmt, -#if defined(GARMIN_ENABLE) && defined(NMEA_ENABLE) +#if defined(GARMIN_ENABLE) && defined(NMEA0183_ENABLE) &garmin_mmt, -#endif /* GARMIN_ENABLE && NMEA_ENABLE */ +#endif /* GARMIN_ENABLE && NMEA0183_ENABLE */ #if defined(GARMIN_ENABLE) && defined(BINARY_ENABLE) &garmin_bin_ser_mmt, #endif /* defined(GARMIN_ENABLE) && defined(BINARY_ENABLE) */ @@ -99,7 +99,7 @@ static const struct monitor_object_t *monitor_objects[] = { #ifdef AIVDM_ENABLE &aivdm_mmt, #endif /* AIVDM_ENABLE */ -#endif /* NMEA_ENABLE */ +#endif /* NMEA0183_ENABLE */ #if defined(SIRF_ENABLE) && defined(BINARY_ENABLE) &sirf_mmt, #endif /* defined(SIRF_ENABLE) && defined(BINARY_ENABLE) */ @@ -561,11 +561,11 @@ static void select_packet_monitor(struct gps_device_t *device) */ if (device->lexer.type != last_type) { const struct gps_type_t *active_type = device->device_type; -#ifdef NMEA_ENABLE +#ifdef NMEA0183_ENABLE if (device->lexer.type == NMEA_PACKET && ((device->device_type->flags & DRIVER_STICKY) != 0)) active_type = &driver_nmea0183; -#endif /* NMEA_ENABLE */ +#endif /* NMEA0183_ENABLE */ if (!switch_type(active_type)) longjmp(terminate, TERM_DRIVER_SWITCH); else { |