From: Roland Scheidegger <sroland@vmware.com>
Date: Wed, 8 Jun 2011 22:45:03 +0000 (+0200)
Subject: mesa: fix gcc version check for _mesa_bitcount
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=da009212fe121206a67cb65ca8f88777a9f7e44f;p=mesa.git

mesa: fix gcc version check for _mesa_bitcount

The version check was bogus, and only inside a non-gcc block anyway.
---

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index f262b25c718..0a572ec225d 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
 
 
 /**