Mesa (master): mesa: fix gcc version check for _mesa_bitcount
Roland Scheidegger
sroland at kemper.freedesktop.org
Wed Jun 8 23:15:18 UTC 2011
Module: Mesa
Branch: master
Commit: da009212fe121206a67cb65ca8f88777a9f7e44f
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=da009212fe121206a67cb65ca8f88777a9f7e44f
Author: Roland Scheidegger <sroland at vmware.com>
Date: Thu Jun 9 00:45:03 2011 +0200
mesa: fix gcc version check for _mesa_bitcount
The version check was bogus, and only inside a non-gcc block anyway.
---
src/mesa/main/imports.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index f262b25..0a572ec 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -511,9 +511,10 @@ _mesa_ffsll(int64_t val)
return 0;
}
+#endif
-
-#if ((_GNUC__ == 3 && __GNUC_MINOR__ < 4) || __GNUC__ < 4)
+#if !defined(__GNUC__) ||\
+ ((_GNUC__ == 3 && __GNUC_MINOR__ < 4) && __GNUC__ < 4)
/**
* Return number of bits set in given GLuint.
*/
@@ -527,7 +528,6 @@ _mesa_bitcount(unsigned int n)
return bits;
}
#endif
-#endif
/**
More information about the mesa-commit
mailing list