summaryrefslogtreecommitdiff
path: root/zodiac.c
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2008-01-19 22:54:23 +0000
committerGary E. Miller <gem@rellim.com>2008-01-19 22:54:23 +0000
commit2f022bcef95228b3a40bee68f0583a7ad2ab25e1 (patch)
tree51d0a49c68f9da7bfc18bad5a23f74d8a76e5454 /zodiac.c
parent602dbae8d3298eeabeaee926514be53e0d1f9f67 (diff)
downloadgpsd-2f022bcef95228b3a40bee68f0583a7ad2ab25e1.tar.gz
'typename' is a reserved word in C++.
Change to 'type_name' so gpsd pieces can be used with C++. Reported by Matt Roberds <mattroberds@cox.net>.
Diffstat (limited to 'zodiac.c')
-rw-r--r--zodiac.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/zodiac.c b/zodiac.c
index 081b61ac..27cb5f96 100644
--- a/zodiac.c
+++ b/zodiac.c
@@ -386,7 +386,7 @@ static gps_mask_t zodiac_analyze(struct gps_device_t *session)
if (trigger!=NULL && strncmp((char *)session->packet.outbuffer, trigger, strlen(trigger))==0 && isatty(session->gpsdata.gps_fd)!=0) {
gpsd_report(LOG_PROG, "found %s.\n", trigger);
- (void)gpsd_switch_driver(session, (*dp)->typename);
+ (void)gpsd_switch_driver(session, (*dp)->type_name);
return 0;
}
}
@@ -430,7 +430,7 @@ static gps_mask_t zodiac_analyze(struct gps_device_t *session)
/* this is everything we export */
struct gps_type_t zodiac_binary =
{
- .typename = "Zodiac binary", /* full name of type */
+ .type_name = "Zodiac binary", /* full name of type */
.trigger = NULL, /* no trigger */
.channels = 12, /* consumer-grade GPS */
.probe_wakeup = NULL, /* no probe on baud rate change */