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/prefs_capture.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/prefs_capture.c')
| -rw-r--r-- | ui/gtk/prefs_capture.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/gtk/prefs_capture.c b/ui/gtk/prefs_capture.c index adfcdfee95..acfbc1b203 100644 --- a/ui/gtk/prefs_capture.c +++ b/ui/gtk/prefs_capture.c @@ -1943,7 +1943,7 @@ ifopts_write_new_buffersize(void) gchar *new_buffersize; /* new preferences interfaces buffer size string */ - new_buffersize = g_malloc0(MAX_VAL_LEN); + new_buffersize = (gchar *)g_malloc0(MAX_VAL_LEN); /* get buffer size for each row (interface) */ model = gtk_tree_view_get_model(GTK_TREE_VIEW(cur_list)); @@ -2002,7 +2002,7 @@ ifopts_write_new_snaplen(void) gchar *new_snaplen; /* new preferences interfaces snap length string */ - new_snaplen = g_malloc0(MAX_VAL_LEN); + new_snaplen = (gchar *)g_malloc0(MAX_VAL_LEN); /* get snap length for each row (interface) */ model = gtk_tree_view_get_model(GTK_TREE_VIEW(cur_list)); @@ -2060,7 +2060,7 @@ ifopts_write_new_pmode(void) gchar *new_pmode; /* new preferences interfaces promiscuous mode string */ - new_pmode = g_malloc0(MAX_VAL_LEN); + new_pmode = (gchar *)g_malloc0(MAX_VAL_LEN); /* get promiscuous mode for each row (interface) */ model = gtk_tree_view_get_model(GTK_TREE_VIEW(cur_list)); |