From 14ee06fed011b9b279002dd477a42a41003d0458 Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Mon, 2 Jun 2025 17:06:12 +0200 Subject: [PATCH] Fix Windows build (few warnings and a wrong file descriptor comparison). --- LCDproc.cpp | 4 ++++ MMDVMHost.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/LCDproc.cpp b/LCDproc.cpp index 1b112c5..eb99d35 100644 --- a/LCDproc.cpp +++ b/LCDproc.cpp @@ -161,7 +161,11 @@ bool CLCDproc::open() /* Create TCP socket */ m_socketfd = socket(clientAddress.ss_family, SOCK_STREAM, 0); +#if defined(_WIN32) || defined(_WIN64) + if (m_socketfd == INVALID_SOCKET) { +#else if (m_socketfd == -1) { +#endif LogError("LCDproc, failed to create socket"); return false; } diff --git a/MMDVMHost.cpp b/MMDVMHost.cpp index daa17ba..6d8a95c 100644 --- a/MMDVMHost.cpp +++ b/MMDVMHost.cpp @@ -1402,7 +1402,9 @@ bool CMMDVMHost::createModem() std::string uartPort = m_conf.getModemUARTPort(); unsigned int uartSpeed = m_conf.getModemUARTSpeed(); std::string i2cPort = m_conf.getModemI2CPort(); +#if defined(__linux__) unsigned int i2cAddress = m_conf.getModemI2CAddress(); +#endif std::string modemAddress = m_conf.getModemModemAddress(); unsigned short modemPort = m_conf.getModemModemPort(); std::string localAddress = m_conf.getModemLocalAddress();