From 41eedc94797366d90fff6f841d3c225ef2473ab0 Mon Sep 17 00:00:00 2001
From: Mike Black W9MDB <mdblack98@yahoo.com>
Date: Tue, 1 Feb 2022 09:12:36 -0600
Subject: [PATCH] Change band_t to hamlib_band_t to avoid collision with
 FLDigi's band_t

---
 include/hamlib/rig.h | 2 +-
 rigs/yaesu/newcat.c  | 4 ++--
 rigs/yaesu/newcat.h  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/hamlib/rig.h b/include/hamlib/rig.h
index 979cb783f..732f07a65 100644
--- a/include/hamlib/rig.h
+++ b/include/hamlib/rig.h
@@ -722,7 +722,7 @@ typedef enum {
     RIG_BAND_GEN = (1 << 13),       /*!< \c 60M */
     RIG_BAND_MW  = (1 << 14),       /*!< \c Medium Wave */
     RIG_BAND_AIR = (1 << 15),       /*!< \c Air band */
-} band_t;
+} hamlib_band_t;
 
 
 /**
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index faee36ee1..a88f12ed1 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -3521,7 +3521,7 @@ int newcat_get_ant(RIG *rig, vfo_t vfo, ant_t dummy, value_t *option,
     RETURNFUNC(RIG_OK);
 }
 
-static int band2rig (band_t band)
+static int band2rig (hamlib_band_t band)
 {
     int retval = 0;
     switch(band)
@@ -4377,7 +4377,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
     case RIG_LEVEL_BAND_SELECT:
         if (newcat_valid_command(rig, "BS"))
         {
-            int band = band2rig((band_t)val.i);
+            int band = band2rig((hamlib_band_t)val.i);
             SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "BS%02d%c", band, cat_term);
         }
         break;
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 4b5c2089f..0e5069038 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20220131"
+#define NEWCAT_VER "20220201"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129