Merge branch 'master' of https://github.com/Hamlib/Hamlib

configure.ac

@@ -80,7 +80,6 @@ AM_CPPFLAGS="${AM_CPPFLAGS} -I\$(top_srcdir)/include -I\$(top_srcdir)/src -I\$(t
 
 dnl Checks for programs.
 AC_PROG_CC
-AC_PROG_CC_STDC
 AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_AWK

security/AESStringCrypt.c

@@ -33,7 +33,7 @@
 
 #ifdef _WIN32
 #include <windows.h>
-#include <Wincrypt.h>
+#include <wincrypt.h>
 #else
 #include <unistd.h>
 #include <stdlib.h>

security/password.c

@@ -21,7 +21,7 @@
  */
 
 #include <stdio.h>
-#include <iconv.h>
+//#include <iconv.h>
 //#include <langinfo.h>
 #include <errno.h>
 #include "password.h"

src/conf.c

@@ -94,7 +94,7 @@ static const struct confparams frontend_cfg_params[] =
     {
         TOK_PTT_TYPE, "ptt_type", "PTT type",
         "Push-To-Talk interface type override",
-        "RIG", RIG_CONF_COMBO, { .c = {{ "RIG", "DTR", "RTS", "Parallel", "CM108", "GPIO", "GPION", "None", NULL }} }
+        "RIG", RIG_CONF_COMBO, { .c = {{ "RIG", "RIGMICDATA", "DTR", "RTS", "Parallel", "CM108", "GPIO", "GPION", "None", NULL }} }
     },
     {
         TOK_PTT_PATHNAME, "ptt_pathname", "PTT path name",