Avoid including intrin.h with cpuid.h

On certain versions of MinGW, that leads to a redefinition errors.
2022-06-17 14:36:34 -07:00 · 2022-06-17 14:36:34 -07:00 · fcc73d3324
parent 314ba2f390
commit fcc73d3324
1 changed files with 3 additions and 4 deletions
--- a/core/cpu_caps.cpp
+++ b/core/cpu_caps.cpp
@ -11,11 +11,10 @@
 #endif
 #endif

-#ifdef HAVE_INTRIN_H
-#include <intrin.h>
-#endif
-#ifdef HAVE_CPUID_H
+#if defined(HAVE_CPUID_H)
 #include <cpuid.h>
+#elif defined(HAVE_INTRIN_H)
+#include <intrin.h>
 #endif

 #include <array>