From 9e422aa58e19edc071eefb007a2b3cd6f70eba98 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 7 May 2026 21:52:18 +0200 Subject: [PATCH] update rapidjson submodule --- external/rapidjson | 2 +- src/device_trezor/trezor/transport.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/external/rapidjson b/external/rapidjson index 129d19ba7..24b5e7a8b 160000 --- a/external/rapidjson +++ b/external/rapidjson @@ -1 +1 @@ -Subproject commit 129d19ba7f496df5e33658527a7158c79b99c21c +Subproject commit 24b5e7a8b27f42fa16b96fc70aade9106cf7102f diff --git a/src/device_trezor/trezor/transport.cpp b/src/device_trezor/trezor/transport.cpp index ec39dc355..66a1c7657 100644 --- a/src/device_trezor/trezor/transport.cpp +++ b/src/device_trezor/trezor/transport.cpp @@ -42,6 +42,12 @@ #include "transport.hpp" #include "messages/messages-common.pb.h" +// https://github.com/Tencent/rapidjson/issues/1448 +#ifdef _WIN32 +#undef GetObject +#endif +#include + #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "device.trezor.transport"