From: 13:02:08 Tim Janik Date: Mon, 10 Dec 2007 12:02:48 +0000 (+0000) Subject: applied patch by Tommi Komulainen to fix int64 printouts, fixes #502511. X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=0dbfa89ba1a781ec45763433e379572ed3257470;p=dana%2Fcg-glib.git applied patch by Tommi Komulainen to fix int64 printouts, fixes #502511. 2007-12-10 13:02:08 Tim Janik * glib/gtestutils.c (g_assertion_message_cmpnum): applied patch by Tommi Komulainen to fix int64 printouts, fixes #502511. svn path=/trunk/; revision=6085 --- diff --git a/ChangeLog b/ChangeLog index e97ff2e0..46993bd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-10 13:02:08 Tim Janik + + * glib/gtestutils.c (g_assertion_message_cmpnum): applied patch by Tommi + Komulainen to fix int64 printouts, fixes #502511. + 2007-12-10 Matthias Clasen * glib/gstrfuncs.h: diff --git a/glib/gtestutils.c b/glib/gtestutils.c index 1e5dd601..f72fc6d7 100644 --- a/glib/gtestutils.c +++ b/glib/gtestutils.c @@ -1143,7 +1143,7 @@ g_assertion_message_cmpnum (const char *domain, switch (numtype) { case 'i': s = g_strdup_printf ("assertion failed (%s): (%.0Lf %s %.0Lf)", expr, arg1, cmp, arg2); break; - case 'x': s = g_strdup_printf ("assertion failed (%s): (0x%08Lx %s 0x%08Lx)", expr, (guint64) arg1, cmp, (guint64) arg2); break; + case 'x': s = g_strdup_printf ("assertion failed (%s): (0x%08" G_GUINT64_FORMAT " %s 0x%08" G_GUINT64_FORMAT ")", expr, (guint64) arg1, cmp, (guint64) arg2); break; case 'f': s = g_strdup_printf ("assertion failed (%s): (%.9Lg %s %.9Lg)", expr, arg1, cmp, arg2); break; /* ideally use: floats=%.7g double=%.17g */ }