Auto-Merge pull request #2950 from octo/ff/wireless

Automatically merged due to "Automerge" label

diff --git a/.travis.yml b/.travis.yml
index 1bd6142..97115d1 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -75,7 +75,7 @@ before_script: autoreconf -fi
 script:
   - if [[ "${TRAVIS_BRANCH}" == "coverity_scan" ]]; then exit 0; fi
   - ./configure
-  - make -j 4
+  - make -j $(nproc)
   - make check
 
 addons:
@@ -85,5 +85,5 @@ addons:
       description: "Build submitted via Travis CI"
     notification_email: collectd-changes@verplant.org
     build_command_prepend: "./configure; make clean"
-    build_command: "make -j 4"
+    build_command: "make -j $(nproc)"
     branch_pattern: coverity_scan

diff --git a/src/daemon/common.h b/src/daemon/common.h
index 8cd4e22..addf06d 100644 (file)
--- a/src/daemon/common.h
+++ b/src/daemon/common.h
@@ -358,7 +358,7 @@ ssize_t read_file_contents(char const *filename, char *buf, size_t bufsize);
 counter_t counter_diff(counter_t old_value, counter_t new_value);
 
 /* Convert a rate back to a value_t. When converting to a derive_t, counter_t
- * or absoltue_t, take fractional residuals into account. This is important
+ * or absolute_t, take fractional residuals into account. This is important
  * when scaling counters, for example.
  * Returns zero on success. Returns EAGAIN when called for the first time; in
  * this case the value_t is invalid and the next call should succeed. Other

diff --git a/src/gps.c b/src/gps.c
index 1d32d04..b22c3a2 100644 (file)
--- 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++;