Fix remaining warnings and errors.

pull/475/head
Mooneer Salem 2023-07-12 23:49:44 -07:00
parent 5f195e9282
commit fa6e55df99
6 changed files with 21 additions and 16 deletions

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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)

View File

@ -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
#endif

View File

@ -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