Fix building on windows-x86 if clang already includes

georgthegreat · terrelln · commit 72c16b187d27 · 2024-04-01T09:53:08.000-07:00
[D101338](https://reviews.llvm.org/D101338) landed in 2021, so clang16 should have it
diff --git a/lib/common/cpu.h b/lib/common/cpu.h
@@ -35,7 +35,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {
     U32 f7b = 0;
     U32 f7c = 0;
 #if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_IX86))
-#if !defined(__clang__)
+#if !defined(__clang__) || __clang_major__ >= 16
     int reg[4];
     __cpuid((int*)reg, 0);
     {

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ MEM_STATIC ZSTD_cpuid_t ZSTD_cpuid(void) {`
`35`	`35`	`U32 f7b = 0;`
`36`	`36`	`U32 f7c = 0;`
`37`	`37`	`#if defined(_MSC_VER) && (defined(_M_X64) \|\| defined(_M_IX86))`
`38`		`-#if !defined(__clang__)`
	`38`	`+#if !defined(__clang__) \|\| __clang_major__ >= 16`
`39`	`39`	`int reg[4];`
`40`	`40`	`__cpuid((int*)reg, 0);`
`41`	`41`	`{`