Merge branch 'jk/pack-bitmap'

gitster · gitster · commit 2c1f554d0ca2 · 2015-02-18T11:45:00.000-08:00
The pack bitmap support did not build with older versions of GCC.

* jk/pack-bitmap:
  ewah: fix building with gcc &lt; 3.4.0
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,8 @@ static inline uint32_t ewah_bit_popcount64(uint64_t x)`
`47`	`47`	`return (x * 0x0101010101010101ULL) >> 56;`
`48`	`48`	`}`
`49`	`49`
`50`		`-#ifdef __GNUC__`
	`50`	`+/* __builtin_ctzll was not available until 3.4.0 */`
	`51`	`+#if defined(__GNUC__) && (__GNUC__ > 3 \|\| (__GNUC__ == 3 && __GNUC_MINOR > 3))`
`51`	`52`	`#define ewah_bit_ctz64(x) __builtin_ctzll(x)`
`52`	`53`	`#else`
`53`	`54`	`static inline int ewah_bit_ctz64(uint64_t x)`