FILPATHLEN is now HAMLIB_FILPATHLEN in 4.2

This commit is contained in:
Richard Shaw 2021-05-30 09:19:25 -05:00
parent bd7574a3d5
commit 46c1728418
2 changed files with 3 additions and 3 deletions

View File

@ -147,7 +147,7 @@ typedef struct rig RIG;
#define RIGNAMSIZ 30
#define RIGVERSIZ 8
#define FILPATHLEN 100
#define HAMLIB_FILPATHLEN 100
#define FRQRANGESIZ 30
#define MAXCHANDESC 30 /* describe channel eg: "WWV 5Mhz" */
#define TSLSTSIZ 20 /* max tuning step list size, zero ended */
@ -1479,7 +1479,7 @@ typedef struct hamlib_port {
int timeout; /*!< Timeout, in mS */
int retry; /*!< Maximum number of retries, 0 to disable */
char pathname[FILPATHLEN]; /*!< Port pathname */
char pathname[HAMLIB_FILPATHLEN]; /*!< Port pathname */
union {
struct {

View File

@ -114,7 +114,7 @@ void RigThread::run() {
std::cout << "Rig thread starting." << std::endl;
rig = rig_init(rigModel);
strncpy(rig->state.rigport.pathname, rigFile.c_str(), FILPATHLEN - 1);
strncpy(rig->state.rigport.pathname, rigFile.c_str(), HAMLIB_FILPATHLEN - 1);
rig->state.rigport.parm.serial.rate = serialRate;
retcode = rig_open(rig);