From 39932d986851d061d6127c9f587e7b1c0c7b5b4e Mon Sep 17 00:00:00 2001
From: guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Sat, 27 Mar 2010 18:24:05 +0000
Subject: Squelch some compiler warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32312 f5534014-38df-0310-8fa8-9805f1628bb7
---
 merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'merge.c')

diff --git a/merge.c b/merge.c
index bedb342855..b64d65baee 100644
--- a/merge.c
+++ b/merge.c
@@ -41,7 +41,7 @@ merge_open_in_files(int in_file_count, char *const *in_file_names,
   merge_in_file_t *files;
   gint64 size;
 
-  files = g_malloc(files_size);
+  files = (merge_in_file_t *)g_malloc(files_size);
   *in_files = files;
 
   for (i = 0; i < in_file_count; i++) {
-- 
cgit v1.2.3