More patches

[Mark Murnane <Mark Murnane Sun COM>]

While I'm cleaning up ...

When compiling a 64-bit glib I came across two type errors left over
from the 64-bit patch Owen applied for me a few weeks ago.  There are
just two changes required, where the declaration of the function doesn't
match the body.
Anyone mind if I commit these changes?

Thanks,

Mark

------------------------------
Mark Murnane
Desktop, Applications and Middleware
Sun Microsystems Ireland
------------------------------

Index: glib/gmessages.c
===================================================================
RCS file: /cvs/gnome/glib/glib/gmessages.c,v
retrieving revision 1.32
diff -u -r1.32 gmessages.c
--- glib/gmessages.c	2001/07/10 22:37:07	1.32
+++ glib/gmessages.c	2001/07/11 16:10:48
@@ -71,7 +71,7 @@
 
 
 /* --- prototypes --- */
-static guint printf_string_upper_bound (const gchar *format,
+static gsize printf_string_upper_bound (const gchar *format,
 					gboolean     may_warn,
 					va_list      args);
 
Index: glib/gstrfuncs.c
===================================================================
RCS file: /cvs/gnome/glib/glib/gstrfuncs.c,v
retrieving revision 1.60
diff -u -r1.60 gstrfuncs.c
--- glib/gstrfuncs.c	2001/06/30 17:19:20	1.60
+++ glib/gstrfuncs.c	2001/07/11 16:10:49
@@ -1879,7 +1879,7 @@
  **/
 gchar *
 g_strrstr_len (const gchar *haystack,
-	       gint         haystack_len,
+	       gssize        haystack_len,
 	       const gchar *needle)
 {
   g_return_val_if_fail (haystack != NULL, NULL);