summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/imports.c
diff options
context:
space:
mode:
authorRoland Scheidegger <sroland@vmware.com>2011-06-09 00:45:03 +0200
committerRoland Scheidegger <sroland@vmware.com>2011-06-09 01:14:50 +0200
commitda009212fe121206a67cb65ca8f88777a9f7e44f (patch)
treed87efadbaf19fa3d1864e46767a4e5aea4db79c5 /src/mesa/main/imports.c
parentb537f54b3a2bd47ec861f5c432c49529684eef21 (diff)
downloadexternal_mesa3d-da009212fe121206a67cb65ca8f88777a9f7e44f.zip
external_mesa3d-da009212fe121206a67cb65ca8f88777a9f7e44f.tar.gz
external_mesa3d-da009212fe121206a67cb65ca8f88777a9f7e44f.tar.bz2
mesa: fix gcc version check for _mesa_bitcount
The version check was bogus, and only inside a non-gcc block anyway.
Diffstat (limited to 'src/mesa/main/imports.c')
-rw-r--r--src/mesa/main/imports.c6
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
/**