Merge pull request #305 from f1rmb/f1rmb_gpsd_fix_status_check_api_version_2

Take care of GPSd API version about fix.
2 years ago · 3409e45d83
parent c027bed0aa f637ff564f
commit 3409e45d83
2 changed files with 8 additions and 0 deletions
--- a/DGIdGateway/APRSWriter.cpp
+++ b/DGIdGateway/APRSWriter.cpp
@ -308,7 +308,11 @@ void CAPRSWriter::sendIdFrameMobile()
 #endif


+#if GPSD_API_MAJOR_VERSION >= 10
+	if (m_gpsdData.fix.status != STATUS_FIX)
+#else
 	if (m_gpsdData.status != STATUS_FIX)
+#endif
 		return;

 	bool latlonSet   = (m_gpsdData.set & LATLON_SET) == LATLON_SET;
--- a/YSFGateway/APRSWriter.cpp
+++ b/YSFGateway/APRSWriter.cpp
@ -307,7 +307,11 @@ void CAPRSWriter::sendIdFrameMobile()
 		return;
 #endif

+#if GPSD_API_MAJOR_VERSION >= 10
 	if (m_gpsdData.fix.status != STATUS_FIX)
+#else
+	if (m_gpsdData.status != STATUS_FIX)
+#endif
 		return;

 	bool latlonSet   = (m_gpsdData.set & LATLON_SET) == LATLON_SET;