From 8d2099fc3ebc30018b06042520e623115c16d875 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Mon, 21 Jul 2025 13:08:10 -0500 Subject: [PATCH] fix macro collision --- support/include/utils/config.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/support/include/utils/config.hpp b/support/include/utils/config.hpp index 47666a5b..02b556e3 100644 --- a/support/include/utils/config.hpp +++ b/support/include/utils/config.hpp @@ -415,6 +415,9 @@ using vlc_string_t = std::unique_ptr; #endif // defined(PROJECT_ENABLE_TPL) #if defined(PROJECT_ENABLE_WINFSP) +#if defined(_ReadWriteBarrier) +#undef _ReadWriteBarrier +#endif // defined(_ReadWriteBarrier) #include "winfsp/winfsp.hpp" #endif // defined(PROJECT_ENABLE_WINFSP) @@ -482,7 +485,7 @@ using http_ranges = std::vector; #endif // defined(__cplusplus) #define REPERTORY_USES_FUNCTION_NAME() \ - static constexpr std::string_view function_name { \ + static constexpr std::string_view function_name { \ static_cast(__FUNCTION__), \ }