gps: fix gps_read #2946
Closed
gps: fix gps_read #2946
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rpv-tomsk
suggested changes
Oct 9, 2018
src/gps.c
Outdated
| @@ -141,7 +141,7 @@ static void *cgps_thread(void *pData) { | |||
| continue; | |||
| } | |||
|
|
|||
| if (gps_read(&gpsd_conn) == -1) { | |||
There was a problem hiding this comment.
Hi!
Thanks for your work on Collectd.
Unfortunately, this patch can't be accepted in this form.
The gpsd version needs to be checked and conditionals added for both old and new gps_read() declarations to be supported.
I think check, based on GPSD_API_MAJOR_VERSION needs to be added.
There was a problem hiding this comment.
Indeed, you're perfectly right, I sent this patch as a quick fix to buildroot failure but collectd needs to support old versions of gpsd, I will try to work on this and update the PR.
gps_read now takes three arguments since version 3.18 of gpsd: see http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=6bba8b329fc7687b15863d30471d5af402467802 So use new prototype if GPSD_API_MAJOR_VERSION is equal to 7 or more and old prototype otherwise Fixes: - http://autobuild.buildroot.net/results/63a4f980d7cdb4b0823840f747589803fcd0d69f Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
The issue can also be fixed by #2947 so I close this PR. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
gps_read now takes three arguments since version 3.18 of gpsd: see
http://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=6bba8b329fc7687b15863d30471d5af402467802
Fixes:
Signed-off-by: Fabrice Fontaine fontaine.fabrice@gmail.com