aboutsummaryrefslogtreecommitdiffstats
path: root/merge.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2004-10-17 02:53:26 +0000
committerGuy Harris <guy@alum.mit.edu>2004-10-17 02:53:26 +0000
commit4624549a992d61ae1881b11aeae5a58de1240c45 (patch)
tree86117c057484b03bfa27d0d967c023c9c3a6fa14 /merge.h
parent236123a94bf8f7fc1e72bbe0b4fed35a3ffa9703 (diff)
From Mark C. Brown: allow the file type for the merge operation to be
specified in the GUI. svn path=/trunk/; revision=12326
Diffstat (limited to 'merge.h')
-rw-r--r--merge.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge.h b/merge.h
index 398a9fa8fd..def3afb4db 100644
--- a/merge.h
+++ b/merge.h
@@ -152,7 +152,7 @@ merge_append_files(int in_file_count, merge_in_file_t in_files[], merge_out_file
* @return TRUE if function succeeded
*/
extern gboolean
-merge_n_files(int out_fd, int in_file_count, char **in_filenames, gboolean do_append, int *err);
+merge_n_files(int out_fd, int in_file_count, char **in_filenames, int filetype, gboolean do_append, int *err);
#ifdef __cplusplus