Fixed compilation issue - missing RIG_IS_SOFT_ERRCODE under Ubuntu 20.04

foldynl · Oct 4, 2024 · 0b2993f · 0b2993f
1 parent 6949330
commit 0b2993f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/rig/drivers/HamlibRigDrv.cpp b/rig/drivers/HamlibRigDrv.cpp
@@ -10,6 +10,13 @@
 #define HAMLIB_FILPATHLEN FILPATHLEN
 #endif
 
+#ifndef RIG_IS_SOFT_ERRCODE
+#define RIG_IS_SOFT_ERRCODE(errcode) (errcode == RIG_EINVAL || errcode == RIG_ENIMPL || errcode == RIG_ERJCTED \
+    || errcode == RIG_ETRUNC || errcode == RIG_ENAVAIL || errcode == RIG_ENTARGET \
+    || errcode == RIG_EVFO || errcode == RIG_EDOM)
+
+#endif
+
 // macro introduced hamlib 4.6
 #ifndef PTTPORT
 #define PTTPORT(r) (&r->state.pttport)

diff --git a/rotator/drivers/HamlibRotDrv.cpp b/rotator/drivers/HamlibRotDrv.cpp
@@ -19,6 +19,13 @@
 #define HAMLIB_FILPATHLEN FILPATHLEN
 #endif
 
+#ifndef RIG_IS_SOFT_ERRCODE
+#define RIG_IS_SOFT_ERRCODE(errcode) (errcode == RIG_EINVAL || errcode == RIG_ENIMPL || errcode == RIG_ERJCTED \
+    || errcode == RIG_ETRUNC || errcode == RIG_ENAVAIL || errcode == RIG_ENTARGET \
+    || errcode == RIG_EVFO || errcode == RIG_EDOM)
+
+#endif
+
 #define POOL_INTERVAL 500
 
 MODULE_IDENTIFICATION("qlog.rotator.driver.hamlibdrv");