Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/pack-bitmap'
author
Junio C Hamano
<gitster@pobox.com>
Wed, 18 Feb 2015 19:45:00 +0000
(11:45 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 18 Feb 2015 19:45:00 +0000
(11:45 -0800)
The pack bitmap support did not build with older versions of GCC.
* jk/pack-bitmap:
ewah: fix building with gcc < 3.4.0
ewah/ewok.h
patch
|
blob
|
history
raw
(from parent 1:
db30b83
)
diff --git
a/ewah/ewok.h
b/ewah/ewok.h
index f6ad190a038a55e39a0b8b135c995413192f80e3..13c6e20412591ed3bc56b38b17419a540264f6c5 100644
(file)
--- 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)