Files
allwpilib/upstream_utils/debugging_patches/0002-Remove-debugger_query-argument-from-Windows-and-macO.patch

37 lines
1.1 KiB
Diff
Raw Normal View History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Thu, 21 Nov 2024 17:23:48 -0800
Fix more emscripten compiler errors (#7895) I ran the CMake configure with: ```bash emcmake cmake -B build-wasm -S . \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_SHARED_LIBS=OFF \ -DWITH_SIMULATION_MODULES=OFF \ -DWITH_PROTOBUF=OFF \ -DWITH_GUI=OFF \ -DWITH_CSCORE=OFF ``` * Turned off simulation modules because they require shared libraries * Turned off GUI because glfw requires libssh * Turned off cscore because it requires OpenCV I still get the following compiler errors: ``` /home/tav/frc/wpilib/allwpilib/wpinet/src/main/native/thirdparty/libuv/src/unix/linux.cpp:43:10: fatal error: 'sys/epoll.h' file not found 43 | #include <sys/epoll.h> | ^~~~~~~~~~~~~ ``` ``` /home/tav/frc/wpilib/allwpilib/wpinet/src/main/native/thirdparty/libuv/src/unix/stream.cpp:991:56: error: comparison of integers of different signs: 'unsigned long' and 'long' [-Werror,-Wsign-compare] 991 | for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) { | ^~~~~~~~~~~~~~~~~~~~~~ /home/tav/.cache/emscripten/sysroot/include/sys/socket.h:358:44: note: expanded from macro 'CMSG_NXTHDR' 358 | __CMSG_LEN(cmsg) + sizeof(struct cmsghdr) >= __MHDR_END(mhdr) - (unsigned char *)(cmsg) \ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` ``` /home/tav/frc/wpilib/allwpilib/wpinet/src/main/native/thirdparty/libuv/src/unix/core.cpp:748:56: error: comparison of integers of different signs: 'unsigned long' and 'long' [-Werror,-Wsign-compare] 748 | for (cmsg = CMSG_FIRSTHDR(msg); cmsg != NULL; cmsg = CMSG_NXTHDR(msg, cmsg)) | ^~~~~~~~~~~~~~~~~~~~~~ /home/tav/.cache/emscripten/sysroot/include/sys/socket.h:358:44: note: expanded from macro 'CMSG_NXTHDR' 358 | __CMSG_LEN(cmsg) + sizeof(struct cmsghdr) >= __MHDR_END(mhdr) - (unsigned char *)(cmsg) \ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ```
2025-04-25 21:56:26 -07:00
Subject: [PATCH 2/5] Remove debugger_query argument from Windows and macOS
---
src/macos.cxx | 2 +-
src/windows.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/macos.cxx b/src/macos.cxx
index bbcf6f2eec9ea479a2bea0ff06b454dc81b5d356..85dbb5f45d89680e39b4847a9aa2d5472c824f2a 100644
--- a/src/macos.cxx
+++ b/src/macos.cxx
@@ -13,7 +13,7 @@ auto exc = std::array<T, EXC_TYPES_COUNT> { {} };
namespace stdx {
-bool is_debugger_present(debugger_query q) noexcept
+bool is_debugger_present() noexcept
{
mach_msg_type_number_t count {};
auto masks = exc<exception_mask_t>;
diff --git a/src/windows.cxx b/src/windows.cxx
index eec576f415d52f63d2658012546ead2e691d7415..45d98eb27c5182de7ad11291925275fb4fdb54fb 100644
--- a/src/windows.cxx
+++ b/src/windows.cxx
@@ -9,7 +9,7 @@
namespace stdx {
-bool is_debugger_present(debugger_query q) noexcept
+bool is_debugger_present() noexcept
{
return ::IsDebuggerPresent();
}