diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-28 18:31:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-28 18:31:42 +0000 |
| commit | 0c0b98ae72397aeed280ffc146b16eb13065f332 (patch) | |
| tree | 4a34d9ba1cc396e912aa5b473bc0a5bba968d656 /mesalib/src/mesa/main/imports.h | |
| parent | ddf3c86d1414ac4d95e352b195ac30188f024429 (diff) | |
| parent | 022d9c6cf6a67385d84ff33ce095f5c7f9f6d0cc (diff) | |
| download | vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.tar.gz vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.tar.bz2 vcxsrv-0c0b98ae72397aeed280ffc146b16eb13065f332.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/imports.h')
| -rw-r--r-- | mesalib/src/mesa/main/imports.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index d28f4ad12..1c263aabc 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/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)); |