mesa: Fix build with gcc 3.3.

Signed-off-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 1ae085336480246b7b298e44fbbd94cfd72e29b2..b1389b25f2a4111b8826d39fa629f01db0c8fecf 100644 (file)
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -564,7 +564,8 @@ _mesa_ffsll(int64_t val)
 unsigned int
 _mesa_bitcount(unsigned int n)
 {
-#if defined(__GNUC__)
+#if defined(__GNUC__) && \
+       ((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
    return __builtin_popcount(n);
 #else
    unsigned int bits;

diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index d28f4ad125d27f4588e4f02407b9b7a3f9f91deb..1c263aabca106133aca11124e537a01ecdd39891 100644 (file)
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -404,7 +404,8 @@ _mesa_is_pow_two(int x)
 static INLINE int32_t
 _mesa_next_pow_two_32(uint32_t x)
 {
-#ifdef __GNUC__
+#if defined(__GNUC__) && \
+       ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
        uint32_t y = (x != 1);
        return (1 + y) << ((__builtin_clz(x - y) ^ 31) );
 #else
@@ -422,7 +423,8 @@ _mesa_next_pow_two_32(uint32_t x)
 static INLINE int64_t
 _mesa_next_pow_two_64(uint64_t x)
 {
-#ifdef __GNUC__
+#if defined(__GNUC__) && \
+       ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
        uint64_t y = (x != 1);
        if (sizeof(x) == sizeof(long))
                return (1 + y) << ((__builtin_clzl(x - y) ^ 63));