Merge pull request #578 from drowe67/ms-hamlib-compile-error

Fix compiler error on some Linux installations.
drowe67 · Oct 25, 2023 · e32fb9d · e32fb9d
2 parents 20a0746 + 971b890
commit e32fb9d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/USER_MANUAL.md b/USER_MANUAL.md
@@ -914,6 +914,7 @@ LDPC | Low Density Parity Check Codes - a family of powerful FEC codes
 1. Bugfixes:
     * Fix issue causing hanging while testing serial port PTT. (PR #577)
     * Fix issue causing improper RX Only reporting when hamlib is disabled. (PR #579)
+    * Fix compiler error on some Linux installations. (PR #578)
 
 ## V1.9.3 October 2023
 

diff --git a/src/audio/PulseAudioEngine.cpp b/src/audio/PulseAudioEngine.cpp
@@ -145,9 +145,8 @@ struct PulseAudioDeviceListTemp
 
 std::vector<AudioDeviceSpecification> PulseAudioEngine::getAudioDeviceList(AudioDirection direction)
 {
-    PulseAudioDeviceListTemp tempObj = {
-        .thisPtr = this
-    };
+    PulseAudioDeviceListTemp tempObj;
+    tempObj.thisPtr = this;
 
     pa_operation* op = nullptr;
 
@@ -231,9 +230,8 @@ struct PaDefaultAudioDeviceTemp
 
 AudioDeviceSpecification PulseAudioEngine::getDefaultAudioDevice(AudioDirection direction)
 {
-    PaDefaultAudioDeviceTemp tempData = {
-        .mainloop = mainloop_
-    };
+    PaDefaultAudioDeviceTemp tempData;
+    tempData.mainloop = mainloop_;
 
     pa_threaded_mainloop_lock(mainloop_);
     auto op = pa_context_get_server_info(context_, [](pa_context *c, const pa_server_info *i, void *userdata) {

diff --git a/src/rig_control/HamlibRigController.cpp b/src/rig_control/HamlibRigController.cpp
@@ -25,6 +25,8 @@
 #include <functional>
 #include <sstream>
 #include <algorithm>
+#include <cstring>
+#include <strings.h>
 
 #include "HamlibRigController.h"
 
@@ -64,10 +66,10 @@ HamlibRigController::HamlibRigController(std::string rigName, std::string serial
     , multipleVfos_(false)
     , pttSet_(false)
     , currFreq_(0)
-    , currMode_(0)
+    , currMode_(RIG_MODE_NONE)
     , restoreOnDisconnect_(restoreFreqModeOnDisconnect)
     , origFreq_(0)
-    , origMode_(0)
+    , origMode_(RIG_MODE_NONE)
 {
     // Perform initial load of rig list if this is our first time being created.
     InitializeHamlibLibrary();
@@ -83,9 +85,11 @@ HamlibRigController::HamlibRigController(int rigIndex, std::string serialPort, c
     , rig_(nullptr)
     , multipleVfos_(false)
     , pttSet_(false)
+    , currFreq_(0)
+    , currMode_(RIG_MODE_NONE)
     , restoreOnDisconnect_(restoreFreqModeOnDisconnect)
     , origFreq_(0)
-    , origMode_(0)
+    , origMode_(RIG_MODE_NONE)
 {
     // Perform initial load of rig list if this is our first time being created.
     InitializeHamlibLibrary();
@@ -220,7 +224,7 @@ void HamlibRigController::connectImpl_()
 
     /* Initialise, configure and open. */
     origFreq_ = 0;
-    origMode_ = 0;
+    origMode_ = RIG_MODE_NONE;
 
     rig_ = rig_init(RigList_[rigIndex]->rig_model);
     if (!rig_) 
@@ -327,7 +331,7 @@ void HamlibRigController::disconnectImpl_()
         }
 
         origFreq_ = 0;
-        origMode_ = 0;
+        origMode_ = RIG_MODE_NONE;
 
         rig_close(rig_);
         rig_cleanup(rig_);
@@ -670,4 +674,4 @@ void HamlibRigController::setModeHelper_(vfo_t currVfo, rmode_t mode)
         currMode_ = mode;
         requestCurrentFrequencyMode();
     }
-}
+}