diff options
author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
---|---|---|
committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:29:09 +0000 |
commit | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (patch) | |
tree | 885dc3989020530f2fcf4b82ec39284d36d43bd4 /ui/gtk/export_object_dlg.c | |
parent | da1bdffa1bbd6a9574afe2e834e1ac501653f3a4 (diff) |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10404
Note: The following parts of the patch had been previously done:
asn1/snmp/packet-snmp-template.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-x11.c
Also; hostlist_table.c: code under '#ifdef HAVE_GEOIP'
didn't compile and needed a few additional patches.
svn path=/trunk/; revision=48447
Diffstat (limited to 'ui/gtk/export_object_dlg.c')
-rw-r--r-- | ui/gtk/export_object_dlg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/export_object_dlg.c b/ui/gtk/export_object_dlg.c index 96db23272e..14fd23ff9f 100644 --- a/ui/gtk/export_object_dlg.c +++ b/ui/gtk/export_object_dlg.c @@ -294,7 +294,7 @@ eo_draw(void *tapdata) gtk_tree_store_append(object_list->store, &new_iter, object_list->iter); - size_str = format_size(eo_entry->payload_len, format_size_unit_bytes|format_size_prefix_si); + size_str = format_size(eo_entry->payload_len, (format_size_flags_e)(format_size_unit_bytes|format_size_prefix_si)); gtk_tree_store_set(object_list->store, &new_iter, EO_PKT_NUM_COLUMN, eo_entry->pkt_num, EO_HOSTNAME_COLUMN, eo_entry->hostname, |