Skip to content

Commit

Permalink
Squashed 'src/minisketch/' changes from 89629eb2c7..7eeb778fef
Browse files Browse the repository at this point in the history
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
  • Loading branch information
fanquake committed Feb 4, 2022
1 parent b6487dc commit 8fcb19f
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/minisketch.cpp
Expand Up @@ -63,9 +63,9 @@ enum class FieldImpl {
#endif
};

#ifdef HAVE_CLMUL
static inline bool EnableClmul()
{
#ifdef HAVE_CLMUL
#ifdef _MSC_VER
int regs[4];
__cpuid(regs, 1);
Expand All @@ -74,10 +74,8 @@ static inline bool EnableClmul()
uint32_t eax, ebx, ecx, edx;
return (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & 0x2));
#endif
#else
return false;
#endif
}
#endif

Sketch* Construct(int bits, int impl)
{
Expand Down

0 comments on commit 8fcb19f

Please sign in to comment.