Check for RIGCAPS_NOT_CONST in Hamlib and update function definition as needed.
parent
ef6d358f34
commit
f4f22e1789
|
|
@ -35,7 +35,11 @@ extern int g_verbose;
|
|||
HamlibRigController::RigList HamlibRigController::RigList_;
|
||||
std::mutex HamlibRigController::RigListMutex_;
|
||||
|
||||
int HamlibRigController::BuildRigList_(const struct rig_caps *rig, rig_ptr_t rigList) {
|
||||
#if RIGCAPS_NOT_CONST
|
||||
int HamlibRigController::BuildRigList_(struct rig_caps *rig, rig_ptr_t rigList) {
|
||||
#else
|
||||
int HamlibRigController::BuildRigList_(const struct rig_caps *rig, rig_ptr_t rigList) {
|
||||
#endif // RIGCAPS_NOT_CONST
|
||||
((HamlibRigController::RigList *)rigList)->push_back(rig);
|
||||
return 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -96,9 +96,14 @@ private:
|
|||
|
||||
static RigList RigList_;
|
||||
static std::mutex RigListMutex_;
|
||||
|
||||
|
||||
static bool RigCompare_(const struct rig_caps *rig1, const struct rig_caps *rig2);
|
||||
|
||||
#if RIGCAPS_NOT_CONST
|
||||
static int BuildRigList_(struct rig_caps *rig, rig_ptr_t);
|
||||
#else
|
||||
static int BuildRigList_(const struct rig_caps *rig, rig_ptr_t);
|
||||
#endif // RIGCAPS_NOT_CONST
|
||||
};
|
||||
|
||||
#endif // HAMLIB_RIG_CONTROLLER_H
|
||||
Loading…
Reference in New Issue