Browse Source

Merge branch 'jk/pack-bitmap' into maint

The pack bitmap support did not build with older versions of GCC.

* jk/pack-bitmap:
  ewah: fix building with gcc < 3.4.0
maint
Junio C Hamano 10 years ago
parent
commit
abfed73ce8
  1. 3
      ewah/ewok.h

3
ewah/ewok.h

@ -47,7 +47,8 @@ static inline uint32_t ewah_bit_popcount64(uint64_t x) @@ -47,7 +47,8 @@ static inline uint32_t ewah_bit_popcount64(uint64_t x)
return (x * 0x0101010101010101ULL) >> 56;
}

#ifdef __GNUC__
/* __builtin_ctzll was not available until 3.4.0 */
#if defined(__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR > 3))
#define ewah_bit_ctz64(x) __builtin_ctzll(x)
#else
static inline int ewah_bit_ctz64(uint64_t x)

Loading…
Cancel
Save