Skip to content

Commit 8fcb19f

Browse files
committed
Squashed 'src/minisketch/' changes from 89629eb2c7..7eeb778fef
7eeb778fef Merge bitcoin-core/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
1 parent b6487dc commit 8fcb19f

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/minisketch.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ enum class FieldImpl {
6363
#endif
6464
};
6565

66+
#ifdef HAVE_CLMUL
6667
static inline bool EnableClmul()
6768
{
68-
#ifdef HAVE_CLMUL
6969
#ifdef _MSC_VER
7070
int regs[4];
7171
__cpuid(regs, 1);
@@ -74,10 +74,8 @@ static inline bool EnableClmul()
7474
uint32_t eax, ebx, ecx, edx;
7575
return (__get_cpuid(1, &eax, &ebx, &ecx, &edx) && (ecx & 0x2));
7676
#endif
77-
#else
78-
return false;
79-
#endif
8077
}
78+
#endif
8179

8280
Sketch* Construct(int bits, int impl)
8381
{

0 commit comments

Comments
 (0)