[OMPT-svn-commit] OpenMPT r23063 - in branches/OpenMPT-1.31: . src/mpt/arch

[<sv...@op...>]

Author: manx
Date: Fri Mar 21 09:58:51 2025
New Revision: 23063
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23063

Log:
Merged revision(s) 23062 from trunk/OpenMPT:
[Fix] mpt/arch/x86_amd64.hpp: Improve ARM64EC compatibility.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/src/mpt/arch/x86_amd64.hpp

Modified: branches/OpenMPT-1.31/src/mpt/arch/x86_amd64.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/arch/x86_amd64.hpp	Fri Mar 21 09:57:27 2025	(r23062)
+++ branches/OpenMPT-1.31/src/mpt/arch/x86_amd64.hpp	Fri Mar 21 09:58:51 2025	(r23063)
@@ -37,8 +37,10 @@
 
 #if MPT_ARCH_X86 || MPT_ARCH_AMD64
 #if MPT_COMPILER_MSVC
-#include <immintrin.h>
 #include <intrin.h>
+#endif
+#if MPT_COMPILER_MSVC
+#include <immintrin.h>
 #elif MPT_COMPILER_GCC || MPT_COMPILER_CLANG
 #include <cpuid.h>
 #include <x86intrin.h>