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/bytes_view.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/bytes_view.c')
| -rw-r--r-- | ui/gtk/bytes_view.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/bytes_view.c b/ui/gtk/bytes_view.c index c8fab31e50..e9cc4f286b 100644 --- a/ui/gtk/bytes_view.c +++ b/ui/gtk/bytes_view.c @@ -1212,7 +1212,7 @@ bytes_view_class_init(BytesViewClass *klass) widget_class->set_scroll_adjustments_signal = g_signal_new(g_intern_static_string("set-scroll-adjustments"), G_OBJECT_CLASS_TYPE(object_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, + (GSignalFlags)(G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION), G_STRUCT_OFFSET(BytesViewClass, set_scroll_adjustments), NULL, NULL, bv_VOID__OBJECT_OBJECT, @@ -1400,7 +1400,7 @@ bytes_view_set_encoding(BytesView *bv, int enc) { g_assert(enc == PACKET_CHAR_ENC_CHAR_ASCII || enc == PACKET_CHAR_ENC_CHAR_EBCDIC); - bv->encoding = enc; + bv->encoding = (packet_char_enc)enc; } void @@ -1408,7 +1408,7 @@ bytes_view_set_format(BytesView *bv, int format) { g_assert(format == BYTES_HEX || format == BYTES_BITS); - bv->format = format; + bv->format = (bytes_view_type)format; switch (format) { case BYTES_BITS: |