diff options
| author | Guy Harris <guy@alum.mit.edu> | 2008-08-13 07:33:51 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2008-08-13 07:33:51 +0000 |
| commit | 7e4d12a120e91b9e790262ac51316dabf1e6dfe6 (patch) | |
| tree | 2d4af72b57e93ae5a41f62668dc0071baaa59658 | |
| parent | 255d6b0af966bbe50037dad60386dbb318a6ce4a (diff) | |
PRI[duox]64 isn't being defined on all platforms, breaking the build,
and we don't want to use it in any case, as PRI[duox]64 might be
different from G_GUINT64_MODIFIER followed by [duox], and the latter is
what GLib's formatter supports, and that's the formatter we use.
svn path=/trunk/; revision=25996
| -rw-r--r-- | epan/dissectors/packet-rtps.c | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-rtps2.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 0c177a061b..d606c9fa63 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -1471,7 +1471,7 @@ static guint64 rtps_util_add_seq_number(proto_tree *tree, offset, 8, all, - "%s: %" PRIu64, label, all); + "%s: %" G_GINT64_MODIFIER "u", label, all); } return all; } @@ -2816,7 +2816,7 @@ static int rtps_util_add_bitmap(proto_tree *tree, tvb, original_offset, offset-original_offset, - "%s: %" PRIu64 "/%d:%s", + "%s: %" G_GINT64_MODIFIER "u/%d:%s", label, seq_base, num_bits, @@ -2826,7 +2826,7 @@ static int rtps_util_add_bitmap(proto_tree *tree, tvb, original_offset, 8, - "bitmapBase: %" PRIu64, + "bitmapBase: %" G_GINT64_MODIFIER "u", seq_base); proto_tree_add_text(bitmap_tree, tvb, diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index 510df838a0..4b18aba940 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -1696,7 +1696,7 @@ static guint64 rtps_util_add_seq_number(proto_tree *tree, offset, 8, all, - "%s: %" PRIu64, label, all); + "%s: %" G_GINT64_MODIFIER "u", label, all); } return all; } @@ -3100,7 +3100,7 @@ static int rtps_util_add_bitmap(proto_tree *tree, tvb, original_offset, offset-original_offset, - "%s: %" PRIu64 "/%d:%s", + "%s: %" G_GINT64_MODIFIER "u/%d:%s", label, seq_base, num_bits, @@ -3110,7 +3110,7 @@ static int rtps_util_add_bitmap(proto_tree *tree, tvb, original_offset, 8, - "bitmapBase: %" PRIu64, + "bitmapBase: %" G_GINT64_MODIFIER "u", seq_base); proto_tree_add_text(bitmap_tree, tvb, @@ -3222,7 +3222,7 @@ static int rtps_util_add_fragment_number_set(proto_tree *tree, tvb, original_offset, offset-original_offset, - "%s: %" PRIu64 "/%d:%s", + "%s: %" G_GINT64_MODIFIER "u/%d:%s", label, base, num_bits, @@ -3232,7 +3232,7 @@ static int rtps_util_add_fragment_number_set(proto_tree *tree, tvb, original_offset, base_size, - "bitmapBase: %" PRIu64, + "bitmapBase: %" G_GINT64_MODIFIER "u", base); proto_tree_add_text(bitmap_tree, tvb, |