Squelch some compiler warnings.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32312 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/merge.c b/merge.c
index bedb342855dec194616869c6e1422d4ff135f1ea..b64d65baeedbb91ec3d94a4e10f4ab670d9383d7 100644 (file)
--- 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++) {

diff --git a/proto_hier_stats.c b/proto_hier_stats.c
index 24d019f211a67604a329e1e3fd2b804f9a86b458..75fb892472a2fd01f93c39e74c7bd43db6f1727b 100644 (file)
--- a/proto_hier_stats.c
+++ b/proto_hier_stats.c
@@ -315,7 +315,7 @@ ph_stats_new(void)
 static gboolean
 stat_node_free(GNode *node, gpointer data _U_)
 {
-       ph_stats_node_t *stats = node->data;
+       ph_stats_node_t *stats = (ph_stats_node_t *)node->data;
 
        if (stats) {
                g_free(stats);