aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2010-03-27 18:24:05 +0000
committerGuy Harris <guy@alum.mit.edu>2010-03-27 18:24:05 +0000
commit985c8afc316b6a7446b5c0d84b11f3d71fd53c78 (patch)
tree3e0dab509c8f53277fc113b423287361af8f7d2e /merge.c
parent1e784fc7fe0f312d89fb47103daa9b28133288c2 (diff)
Squelch some compiler warnings.
svn path=/trunk/; revision=32312
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c2
1 files changed, 1 insertions, 1 deletions
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++) {