Squashed 'src/minisketch/' changes from 89629eb2c7..7eeb778fef

7eeb778fef Merge sipa/minisketch#58: Move `#ifdef HAVE_CLMUL` guard outside of the EnableClmul definition
4d9db2b897 Move `#ifdef HAVE_CLMUL` guard outside of the EnableClmul definition

git-subtree-dir: src/minisketch
git-subtree-split: 7eeb778fef45e21abca01ede85cf0a82e8a510df
This commit is contained in:
Kittywhiskers Van Gogh 2024-10-20 10:37:20 +00:00
parent d71dfabc41
commit 2a7b57f57e

View File

@ -63,9 +63,9 @@ enum class FieldImpl {
#endif #endif
}; };
#ifdef HAVE_CLMUL
static inline bool EnableClmul() static inline bool EnableClmul()
{ {
#ifdef HAVE_CLMUL
#ifdef _MSC_VER #ifdef _MSC_VER
int regs[4]; int regs[4];
__cpuid(regs, 1); __cpuid(regs, 1);
@ -74,10 +74,8 @@ static inline bool EnableClmul()
uint32_t eax, ebx, ecx, edx; uint32_t eax, ebx, ecx, edx;
return (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & 0x2)); return (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & 0x2));
#endif #endif
#else
return false;
#endif
} }
#endif
Sketch* Construct(int bits, int impl) Sketch* Construct(int bits, int impl)
{ {