diff options
| author | 13:02:08 Tim Janik <timj@imendio.com> | 2007-12-10 12:02:48 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2007-12-10 12:02:48 +0000 |
| commit | 0dbfa89ba1a781ec45763433e379572ed3257470 (patch) | |
| tree | 38e401ba32f070ce8cdfb20b8b2e65d0eefcc61c | |
| parent | 51eb9d19bd812a9bd48b67c8d0a29debc9a3974f (diff) | |
| download | glib-0dbfa89ba1a781ec45763433e379572ed3257470.tar.gz | |
applied patch by Tommi Komulainen to fix int64 printouts, fixes #502511.
2007-12-10 13:02:08 Tim Janik <timj@imendio.com>
* glib/gtestutils.c (g_assertion_message_cmpnum): applied patch by Tommi
Komulainen to fix int64 printouts, fixes #502511.
svn path=/trunk/; revision=6085
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | glib/gtestutils.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2007-12-10 13:02:08 Tim Janik <timj@imendio.com> + + * glib/gtestutils.c (g_assertion_message_cmpnum): applied patch by Tommi + Komulainen to fix int64 printouts, fixes #502511. + 2007-12-10 Matthias Clasen <mclasen@redhat.com> * glib/gstrfuncs.h: diff --git a/glib/gtestutils.c b/glib/gtestutils.c index 1e5dd601a..f72fc6d72 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 */ } |