Remove conditional exclusion of stuff in bli_cpuid. Try unsetting the macro at the end

Author: honnibal

blis/_src/frame/base/bli_cpuid.c

@@ -58,7 +58,7 @@
 
 // -----------------------------------------------------------------------------
 
-#if 0 // (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
+#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86))
 
 // This has a conflicting definition in intrin.h on Windows
 #include "cpuid.h"
@@ -1114,3 +1114,7 @@ char* find_string_in( char* target, char* buffer, size_t buf_len, char* filepath
 }
 
 #endif
+
+#ifdef __cpuid
+  #undef __cpuid
+#endif

blis/_src/include/windows-x86_64/blis.h

@@ -26890,7 +26890,7 @@ static bool_t bli_cpuid_has_features( uint32_t have, uint32_t want )
 
 // -----------------------------------------------------------------------------
 
-#if 0 //defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
+#if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
 
 //#include "cpuid.h" // skipped