diff options
author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-03-27 18:24:05 +0000 |
---|---|---|
committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-03-27 18:24:05 +0000 |
commit | 39932d986851d061d6127c9f587e7b1c0c7b5b4e (patch) | |
tree | 3e0dab509c8f53277fc113b423287361af8f7d2e /merge.c | |
parent | 17ffea87866b9f9ff929cd6b41d53c747323fb7e (diff) |
Squelch some compiler warnings.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@32312 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'merge.c')
-rw-r--r-- | merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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++) { |