diff -up Mesa-9.1.1/src/mesa/main/imports.h.solaris Mesa-9.1.1/src/mesa/main/imports.h
--- Mesa-9.1.1/src/mesa/main/imports.h.solaris	2013-03-28 15:33:42.790484206 +0100
+++ Mesa-9.1.1/src/mesa/main/imports.h	2013-03-28 15:33:49.420366449 +0100
@@ -501,10 +501,8 @@ _mesa_realloc( void *oldBuffer, size_t o
 #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