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/follow_stream.c | |
| parent | da1bdffa1bbd6a9574afe2e834e1ac501653f3a4 (diff) | |
| download | wireshark-8112ecc321d5d2025e7b780db21f88a31d0ee472.tar.gz | |
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/follow_stream.c')
| -rw-r--r-- | ui/gtk/follow_stream.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/follow_stream.c b/ui/gtk/follow_stream.c index f8f8338b41..41969e8760 100644 --- a/ui/gtk/follow_stream.c +++ b/ui/gtk/follow_stream.c @@ -97,7 +97,7 @@ follow_read_stream(follow_info_t *follow_info, default : g_assert_not_reached(); - return 0; + return (frs_return_t)0; } } @@ -352,7 +352,7 @@ follow_find_button_cb(GtkWidget * w, gpointer data) if(last_pos_mark) gtk_text_buffer_get_iter_at_mark(buffer, &iter, last_pos_mark); - found = gtk_text_iter_forward_search(&iter, find_string, 0, + found = gtk_text_iter_forward_search(&iter, find_string, (GtkTextSearchFlags)0, &match_start, &match_end, NULL); |