diff --git a/ChangeLog b/ChangeLog
index 23f6821ff..0ba611018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-17  Emmanuele Bassi  <ebassi@gnome.org>
+
+	* glib/gchecksum.c:
+	(sha_byte_reverse): Use the macro GLib provides for byte-swapping
+	as it can be optimized.
+	
+	(g_checksum_update): Fix a compiler warning.
+
 2008-04-15  Mukund Sivaraman  <muks@mukund.org>
 
 	* gio/gfile.c: Fixed typos in gtk-doc comments.
diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index ded85ca5a..0b0ce54fc 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -122,10 +122,7 @@ sha_byte_reverse (guint32 *buffer,
   length /= sizeof (guint32);
   while (length--)
     {
-      *buffer = ((guint32) (((*buffer & (guint32) 0x000000ffU) << 24) |
-                            ((*buffer & (guint32) 0x0000ff00U) <<  8) |
-                            ((*buffer & (guint32) 0x00ff0000U) >>  8) |
-                            ((*buffer & (guint32) 0xff000000U) >> 24)));
+      *buffer = GUINT32_SWAP_LE_BE (*buffer);
       ++buffer;
     }
 }
@@ -1204,7 +1201,7 @@ g_checksum_update (GChecksum    *checksum,
   g_return_if_fail (data != NULL);
 
   if (length < 0)
-    length = strlen (data);
+    length = strlen ((const gchar *) data);
 
   if (checksum->digest_str)
     {