diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:58:59 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-21 02:58:59 +0000 |
| commit | 35d1b406d74101f0ec04026e9a8b2ce75d57201d (patch) | |
| tree | 0f082370b8dc5dd91106bda722e9d097a568dbb3 /ui/gtk/tcp_graph.c | |
| parent | 8112ecc321d5d2025e7b780db21f88a31d0ee472 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10408
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
svn path=/trunk/; revision=48448
Diffstat (limited to 'ui/gtk/tcp_graph.c')
| -rw-r--r-- | ui/gtk/tcp_graph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index 13616d160e..693b2d6f8b 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -3230,7 +3230,7 @@ draw_event(GtkWidget *widget _U_, cairo_t *cr, gpointer user_data) #else static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer user_data) { - struct graph *g = user_data; + struct graph *g = (struct graph *)user_data; cairo_t *cr; debug(DBS_FENTRY) puts("expose_event()"); @@ -3632,7 +3632,7 @@ static gboolean motion_notify_event(GtkWidget *widget _U_, GdkEventMotion *event else { x = (int) event->x; y = (int) event->y; - state = event->state; + state = (GdkModifierType)event->state; } /* Testing just (state & GDK_BUTTON1_MASK) is not enough since when button1 |