| From 991a6d3fd38c2435d94de3853fda36b3330cf6ab Mon Sep 17 00:00:00 2001 |
| From: Baruch Siach <baruch@tkos.co.il> |
| Date: Tue, 9 Oct 2018 19:57:21 +0300 |
| Subject: [PATCH] gps plugin: fix build with newer gpsd |
| |
| gpsd version 3.18 changed the prototype of gps_read(). Make the |
| gps_read() call depend on GPSD_API_MAJOR_VERSION to fix that. |
| |
| This fixes build failures like: |
| |
| gps.c: In function 'cgps_thread': |
| gps.c:144:11: error: too few arguments to function 'gps_read' |
| if (gps_read(&gpsd_conn) == -1) { |
| ^~~~~~~~ |
| |
| Signed-off-by: Baruch Siach <baruch@tkos.co.il> |
| --- |
| Upstream status: https://github.com/collectd/collectd/pull/2947 |
| |
| src/gps.c | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/src/gps.c b/src/gps.c |
| index 1d32d0492617..b22c3a2e5ecd 100644 |
| --- a/src/gps.c |
| +++ b/src/gps.c |
| @@ -141,7 +141,12 @@ static void *cgps_thread(void *pData) { |
| continue; |
| } |
| |
| - if (gps_read(&gpsd_conn) == -1) { |
| +#if GPSD_API_MAJOR_VERSION > 6 |
| + if (gps_read(&gpsd_conn, NULL, 0) == -1) |
| +#else |
| + if (gps_read(&gpsd_conn) == -1) |
| +#endif |
| + { |
| WARNING("gps plugin: incorrect data! (err_count: %d)", err_count); |
| err_count++; |
| |
| -- |
| 2.19.1 |
| |