# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1242951218 0
# Node ID 401f580d56d4f3d11df9edcefbe63d7a1bd1cd2f
# Parent  fdd2952d86399a166077782f351742f08ebb2c64# Parent  e45fe73b47e360e26c061657ffc7edd11436305c
merge of '70479082260072a56b0aea40ccca311822c17155'
     and 'bc7e620f5c66149f20e492d6d02c549e1fab6709'

diff -r fdd2952d8639 -r 401f580d56d4 libpurple/nat-pmp.c
--- a/libpurple/nat-pmp.c	Thu May 21 20:18:10 2009 +0000
+++ b/libpurple/nat-pmp.c	Fri May 22 00:13:38 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 fdd2952d8639 -r 401f580d56d4 libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Thu May 21 20:18:10 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Fri May 22 00:13:38 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();
 		}