On Windows, check that __cpuid is the MSVC function, not a macro

Fixes #15
aegis-aead · Jan 19, 2025 · 5b16f87 · 5b16f87
1 parent 9865507
commit 5b16f87
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/common/cpu.c b/src/common/cpu.c
@@ -138,7 +138,8 @@ _runtime_arm_cpu_features(CPUFeatures *const cpu_features)
 static void
 _cpuid(unsigned int cpu_info[4U], const unsigned int cpu_info_type)
 {
-#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86)) && \
+    !defined(__cpuid) /* __cpuid is a function on MSVC, can be an incompatible macro elsewhere */
     __cpuid((int *) cpu_info, cpu_info_type);
 #elif defined(HAVE_CPUID)
     cpu_info[0] = cpu_info[1] = cpu_info[2] = cpu_info[3] = 0;