From 2509f2e9d5befbc2fccb0600ff3f4aa9e6decb38 Mon Sep 17 00:00:00 2001 From: Geoffrey Merck Date: Sat, 15 Jul 2023 13:44:09 +0200 Subject: [PATCH] #39 better handle libgps versions --- Common/APRSGPSDIdFrameProvider.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Common/APRSGPSDIdFrameProvider.cpp b/Common/APRSGPSDIdFrameProvider.cpp index 7f621be..4891a78 100644 --- a/Common/APRSGPSDIdFrameProvider.cpp +++ b/Common/APRSGPSDIdFrameProvider.cpp @@ -74,12 +74,17 @@ bool CAPRSGPSDIdFrameProvider::buildAPRSFramesInt(const CAPRSEntry * entry, std: return false; #endif -#if GPSD_API_MAJOR_VERSION >= 10 - if(m_gpsdData.fix.status == STATUS_NO_FIX) - return false; -#else +#if GPSD_API_MAJOR_VERSION < 10 if (m_gpsdData.status != STATUS_FIX) return false; +#elif GPSD_API_MAJOR_VERSION == 11 + if(m_gpsdData.fix.status == STATUS_NO_FIX) + return false; +#elif GPSD_API_MAJOR_VERSION <= 14 + if(m_gpsdData.fix.status == STATUS_UNK) + return false; +#elif + #error Unsupported GPSD_API_MAJOR_VERSION #endif bool latlonSet = (m_gpsdData.set & LATLON_SET) == LATLON_SET;