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 /ui/export_object_dicom.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 'ui/export_object_dicom.c')
| -rw-r--r-- | ui/export_object_dicom.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/export_object_dicom.c b/ui/export_object_dicom.c index 2d6c90842e..2ddbc6c058 100644 --- a/ui/export_object_dicom.c +++ b/ui/export_object_dicom.c @@ -41,8 +41,8 @@ gboolean eo_dicom_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, const void *data) { - export_object_list_t *object_list = tapdata; - const dicom_eo_t *eo_info = data; + export_object_list_t *object_list = (export_object_list_t *)tapdata; + const dicom_eo_t *eo_info = (const dicom_eo_t *)data; export_object_entry_t *entry; if (eo_info) { /* We have data waiting for us */ @@ -51,7 +51,7 @@ eo_dicom_packet(void *tapdata, packet_info *pinfo, epan_dissect_t *edt _U_, Still, the values will be freed when the export Object window is closed. Therefore, strings and buffers must be copied */ - entry = g_malloc(sizeof(export_object_entry_t)); + entry = (export_object_entry_t *)g_malloc(sizeof(export_object_entry_t)); entry->pkt_num = pinfo->fd->num; entry->hostname = eo_info->hostname; |