aboutsummaryrefslogtreecommitdiffstats
path: root/editcap.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2013-03-20 01:18:10 +0000
committerBill Meier <wmeier@newsguy.com>2013-03-20 01:18:10 +0000
commit0df5a9390d41149dfc87440d72e7669ba96748ec (patch)
tree8accf4dfc301adfc679ed7f21b7123cb4b2c55f9 /editcap.c
parenta43e5a7eb9fe1ad5a89e7cfd556a791a50fefee7 (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 'editcap.c')
-rw-r--r--editcap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/editcap.c b/editcap.c
index 2d4b18ef5e..3332d5df6a 100644
--- a/editcap.c
+++ b/editcap.c
@@ -814,7 +814,7 @@ list_encap_types(void) {
struct string_elem *encaps;
GSList *list = NULL;
- encaps = g_malloc(sizeof(struct string_elem) * WTAP_NUM_ENCAP_TYPES);
+ encaps = (struct string_elem *)g_malloc(sizeof(struct string_elem) * WTAP_NUM_ENCAP_TYPES);
fprintf(stderr, "editcap: The available encapsulation types for the \"-T\" flag are:\n");
for (i = 0; i < WTAP_NUM_ENCAP_TYPES; i++) {
encaps[i].sstr = wtap_encap_short_string(i);