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/packet_win.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/packet_win.c')
| -rw-r--r-- | ui/gtk/packet_win.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/packet_win.c b/ui/gtk/packet_win.c index 014e612eab..9ed999311d 100644 --- a/ui/gtk/packet_win.c +++ b/ui/gtk/packet_win.c @@ -893,7 +893,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean editable _U_) DataPtr->frame = cfile.current_frame; DataPtr->phdr = cfile.phdr; - DataPtr->pd = g_malloc(DataPtr->frame->cap_len); + DataPtr->pd = (guint8 *)g_malloc(DataPtr->frame->cap_len); memcpy(DataPtr->pd, cfile.pd, DataPtr->frame->cap_len); epan_dissect_init(&(DataPtr->edt), TRUE, TRUE); @@ -988,7 +988,7 @@ void new_packet_window(GtkWidget *w _U_, gboolean editable _U_) static void destroy_new_window(GObject *object _U_, gpointer user_data) { - struct PacketWinData *DataPtr = user_data; + struct PacketWinData *DataPtr = (struct PacketWinData *)user_data; detail_windows = g_list_remove(detail_windows, DataPtr); proto_tree_draw(NULL, DataPtr->tree_view); |