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.c | |
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.c')
-rw-r--r-- | mesalib/src/mesa/main/imports.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c index 1ae085336..b1389b25f 100644 --- a/mesalib/src/mesa/main/imports.c +++ b/mesalib/src/mesa/main/imports.c @@ -564,7 +564,8 @@ _mesa_ffsll(int64_t val) unsigned int _mesa_bitcount(unsigned int n) { -#if defined(__GNUC__) +#if defined(__GNUC__) && \ + ((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4) return __builtin_popcount(n); #else unsigned int bits; |