Mesa (master): Convert additional GNUC_MINOR checks to multiplied version
Alan Coopersmith
alanc at kemper.freedesktop.org
Sat Oct 22 01:41:07 UTC 2011
Module: Mesa
Branch: master
Commit: 7986e4c5a9db24f840af31458bcc254fa52dbb60
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7986e4c5a9db24f840af31458bcc254fa52dbb60
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Fri Oct 21 15:43:28 2011 -0700
Convert additional GNUC_MINOR checks to multiplied version
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
---
src/mesa/main/imports.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 9cb6c6c..797f357 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -453,7 +453,7 @@ static inline int32_t
_mesa_next_pow_two_32(uint32_t x)
{
#if defined(__GNUC__) && \
- ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
+ ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) /* gcc 3.4 or later */
uint32_t y = (x != 1);
return (1 + y) << ((__builtin_clz(x - y) ^ 31) );
#else
@@ -472,7 +472,7 @@ static inline int64_t
_mesa_next_pow_two_64(uint64_t x)
{
#if defined(__GNUC__) && \
- ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
+ ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) /* gcc 3.4 or later */
uint64_t y = (x != 1);
if (sizeof(x) == sizeof(long))
return (1 + y) << ((__builtin_clzl(x - y) ^ 63));
@@ -499,7 +499,7 @@ static inline GLuint
_mesa_logbase2(GLuint n)
{
#if defined(__GNUC__) && \
- ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
+ ((__GNUC__ * 100 + __GNUC_MINOR__) >= 304) /* gcc 3.4 or later */
return (31 - __builtin_clz(n | 1));
#else
GLuint pos = 0;
More information about the mesa-commit
mailing list