diff options
| author | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2013-03-20 01:18:10 +0000 |
| commit | 0df5a9390d41149dfc87440d72e7669ba96748ec (patch) | |
| tree | 8accf4dfc301adfc679ed7f21b7123cb4b2c55f9 /epan/funnel.c | |
| parent | a43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (diff) | |
From beroset:
remove C++ incompatibilities
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397
svn path=/trunk/; revision=48438
Diffstat (limited to 'epan/funnel.c')
| -rw-r--r-- | epan/funnel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/funnel.c b/epan/funnel.c index da768cb3ab..13cf9743db 100644 --- a/epan/funnel.c +++ b/epan/funnel.c @@ -50,7 +50,7 @@ void funnel_register_menu(const char *name, void (*callback)(gpointer), gpointer callback_data, gboolean retap) { - funnel_menu_t* m = g_malloc(sizeof(funnel_menu_t)); + funnel_menu_t* m = (funnel_menu_t *)g_malloc(sizeof(funnel_menu_t)); m->name = g_strdup(name); m->group = group; m->callback = callback; |