[glib/glib-2-32] avoid warning in gutils.h when using gcc with -Wconversion

[Benjamin Otte <otte src gnome org>]

commit 153cad8974740b0a32341b7531a0b66be5181c7c
Author: Hannes Mueller <h c f mueller gmx de>
Date:   Sat Feb 4 10:06:35 2012 +0100

    avoid warning in gutils.h when using gcc with -Wconversion
    
    Old solution to avoid warning with gcc flag -Wconversion does not
    work with gcc >=4.3 since the behaviour for that flag has been
    changed, ref. http://gcc.gnu.org/wiki/NewWconversion. Now cast for
    __builtin_clzl is required, which itself is declared to return int.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=619026

 glib/gutils.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/glib/gutils.h b/glib/gutils.h
index 95114d8..1dd5e56 100644
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -304,7 +304,7 @@ g_bit_storage (gulong number)
 {
 #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
   return G_LIKELY (number) ?
-	   ((GLIB_SIZEOF_LONG * 8U - 1) ^ __builtin_clzl(number)) + 1 : 1;
+	   ((GLIB_SIZEOF_LONG * 8U - 1) ^ (guint) __builtin_clzl(number)) + 1 : 1;
 #else
   register guint n_bits = 0;