# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1242951709 0
# Node ID a667ba19244975ed4b9544997a69a89da3a393c8
# Parent  f82f3dc29f9b02284291ef06f60c8aa62cd9754d# Parent  401f580d56d4f3d11df9edcefbe63d7a1bd1cd2f
merge of '2d746b537f7c15aca747b7df2e1eedb540eb0baf'
     and 'e09226ff43686401f45368b4047b907c205abfba'

diff -r f82f3dc29f9b -r a667ba192449 libpurple/nat-pmp.c
--- a/libpurple/nat-pmp.c	Thu May 21 21:09:17 2009 +0000
+++ b/libpurple/nat-pmp.c	Fri May 22 00:21:49 2009 +0000
@@ -200,7 +200,7 @@
 
     if (!(buf = malloc(needed)))
 	{
-		purple_debug_warning("nat-pmp", "Failed to malloc %i\n", needed);
+		purple_debug_warning("nat-pmp", "Failed to malloc %" G_GSIZE_FORMAT "\n", needed);
 		return NULL;
     }
 
diff -r f82f3dc29f9b -r a667ba192449 libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Thu May 21 21:09:17 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Fri May 22 00:21:49 2009 +0000
@@ -592,7 +592,7 @@
 		if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size)
 		{
 			purple_debug_error("msn",
-				"Oversized slpmsg - msgsize=%lld offset=%" G_GSIZE_FORMAT " len=%" G_GSIZE_FORMAT "\n",
+				"Oversized slpmsg - msgsize=%lld offset=%" G_GUINT64_FORMAT " len=%" G_GSIZE_FORMAT "\n",
 				slpmsg->size, offset, len);
 			g_return_if_reached();
 		}