Use USE_GPSD instead of USE_GPS.

This commit is contained in:
Jonathan Naylor
2020-06-30 11:38:25 +01:00
parent be8c29da3e
commit df47466aa2
11 changed files with 14 additions and 16 deletions

View File

@@ -161,7 +161,7 @@ m_id(0U),
m_cwCallsign(),
m_lockFileEnabled(false),
m_lockFileName(),
#if defined(USE_GPS)
#if defined(USE_GPSD)
m_gpsd(NULL),
#endif
m_remoteControl(NULL),
@@ -1006,7 +1006,7 @@ int CMMDVMHost::run()
if (m_pocsagNetwork != NULL)
m_pocsagNetwork->clock(ms);
#if defined(USE_GPS)
#if defined(USE_GPSD)
if (m_gpsd != NULL)
m_gpsd->clock(ms);
#endif
@@ -1086,7 +1086,7 @@ int CMMDVMHost::run()
m_display->close();
delete m_display;
#if defined(USE_GPS)
#if defined(USE_GPSD)
if (m_gpsd != NULL) {
m_gpsd->close();
delete m_gpsd;
@@ -1398,7 +1398,7 @@ bool CMMDVMHost::createDMRNetwork()
return false;
}
#if defined(USE_GPS)
#if defined(USE_GPSD)
bool gpsdEnabled = m_conf.getGPSDEnabled();
if (gpsdEnabled) {
std::string gpsdAddress = m_conf.getGPSDAddress();