From fa6e55df990b9d27a37722c6ff377f9e487d2104 Mon Sep 17 00:00:00 2001
From: Mooneer Salem <mooneer@gmail.com>
Date: Wed, 12 Jul 2023 23:49:44 -0700
Subject: [PATCH] Fix remaining warnings and errors.

---
 cross-compile/freedv-mingw-llvm-aarch64.cmake | 6 +++---
 cross-compile/freedv-mingw-llvm-armv7.cmake   | 6 +++---
 cross-compile/freedv-mingw-llvm-i686.cmake    | 6 +++---
 cross-compile/freedv-mingw-llvm-x86_64.cmake  | 6 +++---
 src/reporting/pskreporter.cpp                 | 6 +++++-
 src/serialport.cpp                            | 7 ++++---
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/cross-compile/freedv-mingw-llvm-aarch64.cmake b/cross-compile/freedv-mingw-llvm-aarch64.cmake
index 763b10a0..2e7ab0ed 100644
--- a/cross-compile/freedv-mingw-llvm-aarch64.cmake
+++ b/cross-compile/freedv-mingw-llvm-aarch64.cmake
@@ -11,9 +11,9 @@ set(CMAKE_AR ${triple}-ar)
 set(CMAKE_RANLIB ${triple}-ranlib)
 set(CMAKE_RC_COMPILER ${triple}-windres)
 
-set(CMAKE_C_FLAGS -gcodeview)
-set(CMAKE_CXX_FLAGS -gcodeview)
-set(CMAKE_EXE_LINKER_FLAGS -Wno-unused-command-line-argument -Wl,--pdb=)
+set(CMAKE_C_FLAGS "-Wno-unused-command-line-argument -gcodeview")
+set(CMAKE_CXX_FLAGS "-Wno-unused-command-line-argument -gcodeview")
+set(CMAKE_EXE_LINKER_FLAGS -Wl,--pdb=)
 
 # For make package use.
 set(CMAKE_OBJDUMP ${triple}-objdump)
diff --git a/cross-compile/freedv-mingw-llvm-armv7.cmake b/cross-compile/freedv-mingw-llvm-armv7.cmake
index cb8155ac..f6009961 100644
--- a/cross-compile/freedv-mingw-llvm-armv7.cmake
+++ b/cross-compile/freedv-mingw-llvm-armv7.cmake
@@ -12,9 +12,9 @@ set(CMAKE_AR ${triple}-ar)
 set(CMAKE_RANLIB ${triple}-ranlib)
 set(CMAKE_RC_COMPILER ${triple}-windres)
 
-set(CMAKE_C_FLAGS -gcodeview)
-set(CMAKE_CXX_FLAGS -gcodeview)
-set(CMAKE_EXE_LINKER_FLAGS -Wno-unused-command-line-argument -Wl,--pdb=)
+set(CMAKE_C_FLAGS "-Wno-unused-command-line-argument -gcodeview")
+set(CMAKE_CXX_FLAGS "-Wno-unused-command-line-argument -gcodeview")
+set(CMAKE_EXE_LINKER_FLAGS -Wl,--pdb=)
 
 # For make package use.
 set(CMAKE_OBJDUMP ${triple}-objdump)
diff --git a/cross-compile/freedv-mingw-llvm-i686.cmake b/cross-compile/freedv-mingw-llvm-i686.cmake
index 12bc86ee..c73338c2 100644
--- a/cross-compile/freedv-mingw-llvm-i686.cmake
+++ b/cross-compile/freedv-mingw-llvm-i686.cmake
@@ -12,9 +12,9 @@ set(CMAKE_AR ${triple}-ar)
 set(CMAKE_RANLIB ${triple}-ranlib)
 set(CMAKE_RC_COMPILER ${triple}-windres)
 
-set(CMAKE_C_FLAGS -gcodeview)
-set(CMAKE_CXX_FLAGS -gcodeview)
-set(CMAKE_EXE_LINKER_FLAGS -Wno-unused-command-line-argument -Wl,--pdb=)
+set(CMAKE_C_FLAGS "-Wno-unused-command-line-argument -gcodeview")
+set(CMAKE_CXX_FLAGS "-Wno-unused-command-line-argument -gcodeview")
+set(CMAKE_EXE_LINKER_FLAGS -Wl,--pdb=)
 
 # For make package use.
 set(CMAKE_OBJDUMP ${triple}-objdump)
diff --git a/cross-compile/freedv-mingw-llvm-x86_64.cmake b/cross-compile/freedv-mingw-llvm-x86_64.cmake
index 87cd46ee..91614632 100644
--- a/cross-compile/freedv-mingw-llvm-x86_64.cmake
+++ b/cross-compile/freedv-mingw-llvm-x86_64.cmake
@@ -12,9 +12,9 @@ set(CMAKE_AR ${triple}-ar)
 set(CMAKE_RANLIB ${triple}-ranlib)
 set(CMAKE_RC_COMPILER ${triple}-windres)
 
-set(CMAKE_C_FLAGS -gcodeview)
-set(CMAKE_CXX_FLAGS -gcodeview)
-set(CMAKE_EXE_LINKER_FLAGS -Wno-unused-command-line-argument -Wl,--pdb=)
+set(CMAKE_C_FLAGS "-Wno-unused-command-line-argument -gcodeview")
+set(CMAKE_CXX_FLAGS "-Wno-unused-command-line-argument -gcodeview")
+set(CMAKE_EXE_LINKER_FLAGS -Wl,--pdb=)
 
 # For make package use.
 set(CMAKE_OBJDUMP ${triple}-objdump)
diff --git a/src/reporting/pskreporter.cpp b/src/reporting/pskreporter.cpp
index 04b15923..2e7307d1 100644
--- a/src/reporting/pskreporter.cpp
+++ b/src/reporting/pskreporter.cpp
@@ -32,7 +32,11 @@
 #include <unistd.h>
 #include <time.h>
 #if defined(WIN32) || defined(__MINGW32__)
+
+#ifndef _WIN32_WINNT
 #define _WIN32_WINNT 0x0600
+#endif // !_WIN32_WINNT
+
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <ws2def.h>
@@ -339,4 +343,4 @@ int main()
     reporter.send();
     return 0;
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/serialport.cpp b/src/serialport.cpp
index 8f2e418a..2165e818 100644
--- a/src/serialport.cpp
+++ b/src/serialport.cpp
@@ -1,6 +1,7 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
+#include <string>
 #include <unistd.h>
 #include "serialport.h"
 
@@ -131,12 +132,12 @@ error:
         {
 #ifdef UNICODE
             std::vector<char> buffer;
-            std::string errFn = "[Unknown Function]"
-            int size = WideCharToMultiByte(CP_UTF8, 0, text, -1, NULL, 0, NULL, NULL);
+            std::string errFn = "[Unknown Function]";
+            int size = WideCharToMultiByte(CP_UTF8, 0, lpszFunction, -1, NULL, 0, NULL, NULL);
             if (size > 0) 
             {
                 buffer.resize(size);
-                WideCharToMultiByte(CP_UTF8, 0, text, -1, static_cast<BYTE*>(&buffer[0]), buffer.size(), NULL, NULL);
+                WideCharToMultiByte(CP_UTF8, 0, lpszFunction, -1, static_cast<LPSTR>(&buffer[0]), buffer.size(), NULL, NULL);
                 errFn = std::string(&buffer[0]);
             }
             else