message: Squashed 'src/minisketch/' changes from 89629eb2c7..7eeb778fef
  Merge sipa/minisketch#58: Move `#ifdef HAVE_CLMUL` guard outside of the EnableClmul definition
  Move `#ifdef HAVE_CLMUL` guard outside of the EnableClmul definition
  git-subtree-dir: src/minisketch
  git-subtree-split:
diff: @@ -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);
  @@ -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)
  {
  