From 9664354924fef3f68d71c0e8095dcfa63468f05e Mon Sep 17 00:00:00 2001 From: thirumalai-qcom Date: Wed, 12 Feb 2025 07:14:26 +0000 Subject: [PATCH] frontend: Define WIN32_LEAN_AND_MEAN conditionally for ARM64 To avoid redefinition errors, define WIN32_LEAN_AND_MEAN conditionally if not defined in win-ARM64 devices. --- frontend/dialogs/OBSBasicFilters.cpp | 2 ++ frontend/dialogs/OBSBasicInteraction.cpp | 2 ++ frontend/dialogs/OBSBasicProperties.cpp | 2 ++ 3 files changed, 6 insertions(+) diff --git a/frontend/dialogs/OBSBasicFilters.cpp b/frontend/dialogs/OBSBasicFilters.cpp index 94bd1b5c7..664024883 100644 --- a/frontend/dialogs/OBSBasicFilters.cpp +++ b/frontend/dialogs/OBSBasicFilters.cpp @@ -30,7 +30,9 @@ #include #ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 +#endif #include #endif diff --git a/frontend/dialogs/OBSBasicInteraction.cpp b/frontend/dialogs/OBSBasicInteraction.cpp index e4c2b705e..67880c75d 100644 --- a/frontend/dialogs/OBSBasicInteraction.cpp +++ b/frontend/dialogs/OBSBasicInteraction.cpp @@ -27,7 +27,9 @@ #include #ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 +#endif #include #endif diff --git a/frontend/dialogs/OBSBasicProperties.cpp b/frontend/dialogs/OBSBasicProperties.cpp index ee656f595..881ed5e0d 100644 --- a/frontend/dialogs/OBSBasicProperties.cpp +++ b/frontend/dialogs/OBSBasicProperties.cpp @@ -27,7 +27,9 @@ #include #ifdef _WIN32 +#ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN 1 +#endif #include #endif