aboutsummaryrefslogtreecommitdiffstats
path: root/merge.c
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2004-06-18 12:04:49 +0000
committerJörg Mayer <jmayer@loplof.de>2004-06-18 12:04:49 +0000
commita3b7664597002cf1a5c7cdc4917b8fe3717b2a43 (patch)
treeb6339528f4eeb7fffde06fcb57a32be2f73887bc /merge.c
parenta43f7d1f88d469b0063769511f214d097a390e52 (diff)
Fix compile errors on Suse 9.1:
- It's gboolean not boolean Fix warning about extraneous , at end of enum. svn path=/trunk/; revision=11177
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/merge.c b/merge.c
index c673393f89..64f24a573b 100644
--- a/merge.c
+++ b/merge.c
@@ -1,6 +1,6 @@
/* Combine two dump files, either by appending or by merging by timestamp
*
- * $Id: merge.c,v 1.3 2004/06/18 10:01:59 ulfl Exp $
+ * $Id: merge.c,v 1.4 2004/06/18 12:04:49 jmayer Exp $
*
* Written by Scott Renfro <scott@renfro.org> based on
* editcap by Richard Sharpe and Guy Harris
@@ -93,7 +93,7 @@ append_loop(wtap *wth, int count, merge_out_file_t *out_file, int *err,
/*
* routine to concatenate files
*/
-boolean
+gboolean
merge_append_files(int count, merge_in_file_t in_files[], merge_out_file_t *out_file, int *err)
{
int i;