[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gpsd-dev] [PATCH] [libgpsd-core] Fix regression from changing NMEA_ENAB
From: |
Michael Brown |
Subject: |
[gpsd-dev] [PATCH] [libgpsd-core] Fix regression from changing NMEA_ENABLE to NMEA0183_ENABLE |
Date: |
Fri, 22 Jan 2016 11:00:03 +0000 |
Commit 3e25e21 ("Address Savannah bug #46082 - Can't explicitly build
with NMEA drivers.") performed an almost global search and replace of
NMEA_ENABLE to NMEA0183_ENABLE. This search and replace caught the
"#ifdef NON_NMEA_ENABLE" in gpsd_activate(), but missed the
corresponding "#define NON_NMEA_ENABLE" in gpsd.h-tail. The end
result is that devices requiring active probing (e.g. Garmin USB
devices) are effectively unsupported in version 3.16.
Fix by renaming back to NON_NMEA_ENABLE.
Signed-off-by: Michael Brown <address@hidden>
---
libgpsd_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libgpsd_core.c b/libgpsd_core.c
index c3aad99..9e96f1e 100644
--- a/libgpsd_core.c
+++ b/libgpsd_core.c
@@ -563,7 +563,7 @@ int gpsd_activate(struct gps_device_t *session, const int
mode)
return session->gpsdata.gps_fd;
}
-#ifdef NON_NMEA0183_ENABLE
+#ifdef NON_NMEA_ENABLE
/* if it's a sensor, it must be probed */
if ((session->servicetype == service_sensor) &&
(session->sourcetype != source_can)) {
@@ -593,7 +593,7 @@ int gpsd_activate(struct gps_device_t *session, const int
mode)
"no probe matched...\n");
}
foundit:
-#endif /* NON_NMEA0183_ENABLE */
+#endif /* NON_NMEA_ENABLE */
gpsd_clear(session);
gpsd_log(&session->context->errout, LOG_INF,
--
2.3.8
- [gpsd-dev] [PATCH] [libgpsd-core] Fix regression from changing NMEA_ENABLE to NMEA0183_ENABLE,
Michael Brown <=