diff options
| author | Eric S. Raymond <esr@thyrsus.com> | 2013-10-30 23:11:40 -0400 |
|---|---|---|
| committer | Eric S. Raymond <esr@thyrsus.com> | 2013-10-30 23:11:40 -0400 |
| commit | 7094b0fbbbf49a2339108edd7dc0af52841834e7 (patch) | |
| tree | 3c19d75601139b43e34fd7e9febead8557610908 /driver_proto.c | |
| parent | 56e9094724cd76cba6a2036a399667bbddb7f109 (diff) | |
| download | gpsd-7094b0fbbbf49a2339108edd7dc0af52841834e7.tar.gz | |
Revert "Separate ntpd support from chrony support, step 1."
We'll have to sneak up on this change more slowly.
Diffstat (limited to 'driver_proto.c')
| -rw-r--r-- | driver_proto.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/driver_proto.c b/driver_proto.c index f14e0e75..f9f7f060 100644 --- a/driver_proto.c +++ b/driver_proto.c @@ -453,8 +453,8 @@ static void _proto__set_mode(struct gps_device_t *session, int mode) } #endif /* RECONFIGURE_ENABLE */ -#ifdef TIMESERVICE_ENABLE -static double _proto_time_offset(struct gps_device_t *session) +#ifdef NTPSHM_ENABLE +static double _proto_ntp_offset(struct gps_device_t *session) { /* * If NTP notification is enabled, the GPS will occasionally NTP @@ -468,7 +468,7 @@ static double _proto_time_offset(struct gps_device_t *session) */ return MAGIC_CONSTANT; } -#endif /* TIMESERVICE_ENABLE */ +#endif /* NTPSHM_ENABLE */ static void _proto__wrapup(struct gps_device_t *session) { @@ -525,9 +525,9 @@ const struct gps_type_t _proto__binary = { /* Control string sender - should provide checksum and headers/trailer */ .control_send = _proto__control_send, #endif /* CONTROLSEND_ENABLE */ -#ifdef TIMESERVICE_ENABLE - .time_offset = _proto_time_offset, -#endif /* TIMESERVICE_ENABLE */ +#ifdef NTPSHM_ENABLE + .ntp_offset = _proto_ntp_offset, +#endif /* NTPSHM_ENABLE */ /* *INDENT-ON* */ }; #endif /* defined(_PROTO__ENABLE) && defined(BINARY_ENABLE) */ |