projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #3019 from sradco/master
[collectd.git]
/
src
/
gps.c
diff --git
a/src/gps.c
b/src/gps.c
index
1d32d04
..
4d65176
100644
(file)
--- a/
src/gps.c
+++ b/
src/gps.c
@@
-27,8
+27,8
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
-#include "common.h"
#include "plugin.h"
#include "plugin.h"
+#include "utils/common/common.h"
#include "utils_time.h"
#define CGPS_TRUE 1
#include "utils_time.h"
#define CGPS_TRUE 1
@@
-141,7
+141,12
@@
static void *cgps_thread(void *pData) {
continue;
}
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++;
WARNING("gps plugin: incorrect data! (err_count: %d)", err_count);
err_count++;