diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-26 05:02:05 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-26 05:02:05 +0000 |
| commit | 684c9e5d5ce43cf1ec8073cc1de6bd5725f59a4c (patch) | |
| tree | 3f44012ad024fba96212b8e795aa60bbf763f3fa /ui/gtk/drag_and_drop.c | |
| parent | 606e1ed681b03e150ecb23bbb4d35c8d2717fe55 (diff) | |
From Jim Young:
Add casts to support c++ when HAVE_GTKOSXAPPLICATION is defined.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8525
svn path=/trunk/; revision=48557
Diffstat (limited to 'ui/gtk/drag_and_drop.c')
| -rw-r--r-- | ui/gtk/drag_and_drop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/drag_and_drop.c b/ui/gtk/drag_and_drop.c index dac52e2868..9b108b0ba5 100644 --- a/ui/gtk/drag_and_drop.c +++ b/ui/gtk/drag_and_drop.c @@ -343,7 +343,7 @@ gtk_osx_openFile (GtkosxApplication *app _U_, gchar *path, gpointer user_data _U gchar* selection_path; size_t length = strlen(path); - selection_path = g_malloc(length + 3); + selection_path = (gchar *)g_malloc(length + 3); memcpy(selection_path, path, length); selection_path[length] = '\r'; |