summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2013-03-28 17:06:35 -0600
committerBrian Paul <brianp@vmware.com>2013-04-01 08:40:35 -0600
commit95df2b28831147b3e7ce2a3b6257bf60c46b4ab4 (patch)
tree8e854f67e01de73969c55df00e342f3dc556425e
parent99811c344b830c2aa7910a6723be7e7ef0e8b327 (diff)
mesa: remove platform checks around __builtin_ffs, __builtin_ffsll
Use the __builtin_ffs, __builtin_ffsll functions whenever we have GCC, not just for specific platforms. Fixes Solaris build. Note: This is a candidate for the stable branches. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62868 Signed-off-by: Brian Paul <brianp@vmware.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
-rw-r--r--src/mesa/main/imports.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 4b783818b2..c4110ef10b 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -500,17 +500,11 @@ _mesa_realloc( void *oldBuffer, size_t oldSize, size_t newSize );
#ifndef FFS_DEFINED
#define FFS_DEFINED 1
#ifdef __GNUC__
-
-#if defined(__MINGW32__) || defined(__CYGWIN__) || defined(ANDROID) || defined(__APPLE__)
#define ffs __builtin_ffs
#define ffsll __builtin_ffsll
-#endif
-
#else
-
extern int ffs(int i);
extern int ffsll(long long int i);
-
#endif /*__ GNUC__ */
#endif /* FFS_DEFINED */