From 0df5a9390d41149dfc87440d72e7669ba96748ec Mon Sep 17 00:00:00 2001
From: Bill Meier <wmeier@newsguy.com>
Date: Wed, 20 Mar 2013 01:18:10 +0000
Subject:  From beroset:  remove C++ incompatibilities 
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10397

svn path=/trunk/; revision=48438
---
 editcap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'editcap.c')

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);
-- 
cgit v1.2.3