From 4ca8cdfc0ae83891ad25c2a67cb38c6321e06bb6 Mon Sep 17 00:00:00 2001 From: jpark37 Date: Fri, 17 Sep 2021 21:19:58 -0700 Subject: [PATCH] libobs/util: Simplify emmintrin.h wrapper macro Also add WIN32_LEAN_AND_MEAN for external Windows.h include. --- libobs/util/sse-intrin.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libobs/util/sse-intrin.h b/libobs/util/sse-intrin.h index a972c0725..6441e8064 100644 --- a/libobs/util/sse-intrin.h +++ b/libobs/util/sse-intrin.h @@ -17,11 +17,13 @@ #pragma once -#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) && \ - !(defined(_M_ARM64) || defined(_M_ARM64EC)) - +#if defined(_MSC_VER) && \ + ((defined(_M_X64) && !defined(_M_ARM64EC)) || defined(_M_IX86)) #include #else +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif #define SIMDE_ENABLE_NATIVE_ALIASES #include "simde/x86/sse2.h" #endif