diff mbox series

alfred-gpsd: Fix build against gpsd ABI 9.0

Message ID 20200115200158.2920-1-sven@narfation.org
State Accepted, archived
Delegated to: Simon Wunderlich
Headers show
Series alfred-gpsd: Fix build against gpsd ABI 9.0 | expand

Commit Message

Sven Eckelmann Jan. 15, 2020, 8:01 p.m. UTC
libgpsd 3.20 removed the timestamp_t type and the function
unix_to_iso8601(). The same release introduced the timespec_t based
function timespec_to_iso8601().

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 gpsd/alfred-gpsd.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c
index 884bdbf..47d6a64 100644
--- a/gpsd/alfred-gpsd.c
+++ b/gpsd/alfred-gpsd.c
@@ -8,6 +8,8 @@ 
 
 #include "alfred-gpsd.h"
 
+#include <time.h>
+
 static struct globals gpsd_globals;
 
 static int alfred_open_sock(struct globals *globals)
@@ -64,19 +66,31 @@  static int gpsd_publish_data(struct globals *globals)
 	return 0;
 }
 
+static void gpsd_now_to_iso8601(char *tbuf, size_t len)
+{
+#if GPSD_API_MAJOR_VERSION >= 9
+	timespec_t now;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	timespec_to_iso8601(now, tbuf, len);
+#else
+	timestamp_t now = timestamp();
+	unix_to_iso8601(now, tbuf, len);
+#endif
+}
+
 static void gpsd_get_location(struct globals *globals)
 {
 	if (globals->source == SOURCE_CMDLINE) {
 		char tbuf[JSON_DATE_MAX+1];
-		timestamp_t now = timestamp();
 
+		gpsd_now_to_iso8601(tbuf, sizeof(tbuf));
 		sprintf(globals->gpsd_data->tpv,
 			"{\"class\":\"TPV\",\"device\":\"command line\","
 			"\"time\":\"%s\","
 			"\"lat\":%f,\"lon\":%f,\"alt\":%f,"
 			"\"mode\":3}",
-			unix_to_iso8601(now, tbuf, sizeof(tbuf)),
-			globals->lat, globals->lon, globals->alt);
+			tbuf, globals->lat, globals->lon, globals->alt);
 		globals->gpsd_data->tpv_len =
 			htonl(strlen(globals->gpsd_data->tpv) + 1);
 	}