diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-02-18 11:45:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-18 11:45:00 -0800 |
| commit | 2c1f554d0ca2c35c213d68d94baf30f11180f4ce (patch) | |
| tree | 6ef2d1e0e2c7245653fe1f259dd1302da15ab3b9 /ewah | |
| parent | db30b8333b24ef54d877ddbd5ac929779b45331e (diff) | |
| parent | bd4e8822da3bf6ce28a0c5f7c1bbf1b6341c0586 (diff) | |
| download | git-2c1f554d0ca2c35c213d68d94baf30f11180f4ce.tar.gz | |
Merge branch 'jk/pack-bitmap'
The pack bitmap support did not build with older versions of GCC.
* jk/pack-bitmap:
ewah: fix building with gcc < 3.4.0
Diffstat (limited to 'ewah')
| -rw-r--r-- | ewah/ewok.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ewah/ewok.h b/ewah/ewok.h index f6ad190a03..13c6e20412 100644 --- a/ewah/ewok.h +++ b/ewah/ewok.h @@ -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) |