changeset 27012:a667ba192449

merge of '2d746b537f7c15aca747b7df2e1eedb540eb0baf' and 'e09226ff43686401f45368b4047b907c205abfba'
author Paul Aurich <paul@darkrain42.org>
date Fri, 22 May 2009 00:21:49 +0000
parents f82f3dc29f9b (current diff) 401f580d56d4 (diff)
children 6105fa42b60c
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
     }
 
--- 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();
 		}