fix _mesa_ffs() return, test for more platforms (Evgeny Kotsuba)

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 7c37cbf399ce0ef068f2ccefeb9fa441c1881d2a..97d7d57bd280eae25c660a5f8198d2d48a7cbef0 100644 (file)
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -534,7 +534,7 @@ _mesa_pow(double x, double y)
 int
 _mesa_ffs(int i)
 {
-#if defined(_WIN32) && !defined(__MINGW32__)
+#if (defined(_WIN32) && !defined(__MINGW32__) ) || defined(__IBMC__) || defined(__IBMCPP__)
    register int bit = 0;
    if (i != 0) {
       if ((i & 0xffff) == 0) {
@@ -553,8 +553,8 @@ _mesa_ffs(int i)
          bit++;
          i >>= 1;
       }
-      return bit;
    }
+   return bit;
 #elif defined(XFree86LOADER) && defined(IN_MODULE)
    return xf86ffs(i);
 #else