Commit 451c852a authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.3.1' into maint-0.3.2

parents 2aa1767b c1d98c75

changes/bug24633

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (portability, msvc):

    - Fix a bug in the bit-counting parts of our timing-wheel code on

      MSVC. (Note that MSVC is still not a supported build platform,

      due to cyptographic timing channel risks.) Fixes bug 24633;

      bugfix on 0.2.9.1-alpha.

src/ext/timeouts/timeout-bitops.c

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static __inline int clz32(unsigned long val) 
{

	DWORD zeros = 0;

	_BitScanReverse(&zeros, val);

	return zeros;

	return 31 - zeros;

}

#ifdef _WIN64

/* According to the documentation, these only exist on Win64. */
@@ -54,7 +54,7 @@ static __inline int clz64(uint64_t val) 
{

	DWORD zeros = 0;

	_BitScanReverse64(&zeros, val);

	return zeros;

	return 63 - zeros;

}

#else

static __inline int ctz64(uint64_t val)