|
 |
54e5cfe |
From 46c172841802f61476b09e648f31e037e5e5a067 Mon Sep 17 00:00:00 2001
|
|
|
54e5cfe |
From: Richard Shaw <hobbes1069@gmail.com>
|
|
|
54e5cfe |
Date: Sun, 30 May 2021 09:19:25 -0500
|
|
|
54e5cfe |
Subject: [PATCH] FILPATHLEN is now HAMLIB_FILPATHLEN in 4.2
|
|
|
54e5cfe |
|
|
|
54e5cfe |
---
|
|
|
54e5cfe |
external/hamlib/hamlib/rig.h | 4 ++--
|
|
|
54e5cfe |
src/rig/RigThread.cpp | 2 +-
|
|
|
54e5cfe |
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
54e5cfe |
|
|
|
54e5cfe |
diff --git a/external/hamlib/hamlib/rig.h b/external/hamlib/hamlib/rig.h
|
|
|
54e5cfe |
index b94af30c..2722fd52 100644
|
|
|
54e5cfe |
--- a/external/hamlib/hamlib/rig.h
|
|
|
54e5cfe |
+++ b/external/hamlib/hamlib/rig.h
|
|
|
54e5cfe |
@@ -147,7 +147,7 @@ typedef struct rig RIG;
|
|
|
54e5cfe |
|
|
|
54e5cfe |
#define RIGNAMSIZ 30
|
|
|
54e5cfe |
#define RIGVERSIZ 8
|
|
|
54e5cfe |
-#define FILPATHLEN 100
|
|
|
54e5cfe |
+#define HAMLIB_FILPATHLEN 100
|
|
|
54e5cfe |
#define FRQRANGESIZ 30
|
|
|
54e5cfe |
#define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
|
|
|
54e5cfe |
#define TSLSTSIZ 20 /* max tuning step list size, zero ended */
|
|
|
54e5cfe |
@@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
|
|
|
54e5cfe |
int timeout; /*!< Timeout, in mS */
|
|
|
54e5cfe |
int retry; /*!< Maximum number of retries, 0 to disable */
|
|
|
54e5cfe |
|
|
|
54e5cfe |
- char pathname[FILPATHLEN]; /*!< Port pathname */
|
|
|
54e5cfe |
+ char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
|
|
|
54e5cfe |
|
|
|
54e5cfe |
union {
|
|
|
54e5cfe |
struct {
|
|
|
54e5cfe |
diff --git a/src/rig/RigThread.cpp b/src/rig/RigThread.cpp
|
|
|
54e5cfe |
index dccee9ef..60e70eb2 100644
|
|
|
54e5cfe |
--- a/src/rig/RigThread.cpp
|
|
|
54e5cfe |
+++ b/src/rig/RigThread.cpp
|
|
|
54e5cfe |
@@ -114,7 +114,7 @@ void RigThread::run() {
|
|
|
54e5cfe |
std::cout << "Rig thread starting." << std::endl;
|
|
|
54e5cfe |
|
|
|
54e5cfe |
rig = rig_init(rigModel);
|
|
|
54e5cfe |
- strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
|
|
|
54e5cfe |
+ strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
|
|
|
54e5cfe |
rig->state.rigport.parm.serial.rate = serialRate;
|
|
|
54e5cfe |
retcode = rig_open(rig);
|
|
|
54e5cfe |
|