diff options
author | Jörg Mayer <jmayer@loplof.de> | 2004-06-18 12:04:49 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2004-06-18 12:04:49 +0000 |
commit | a3b7664597002cf1a5c7cdc4917b8fe3717b2a43 (patch) | |
tree | b6339528f4eeb7fffde06fcb57a32be2f73887bc | |
parent | a43f7d1f88d469b0063769511f214d097a390e52 (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
-rw-r--r-- | merge.c | 4 | ||||
-rw-r--r-- | merge.h | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -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; @@ -2,7 +2,7 @@ * Definitions for menu routines with toolkit-independent APIs but * toolkit-dependent implementations. * - * $Id: merge.h,v 1.1 2004/06/18 10:01:59 ulfl Exp $ + * $Id: merge.h,v 1.2 2004/06/18 12:04:49 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -58,7 +58,7 @@ typedef struct merge_out_file_s { typedef enum { VERBOSE_NONE, VERBOSE_ERRORS, - VERBOSE_ALL, + VERBOSE_ALL } verbose_e; /** Current verbosity level, default is VERBOSE_NONE. */ @@ -137,7 +137,7 @@ merge_files(int in_file_count, merge_in_file_t in_files[], merge_out_file_t *out * @param err wiretap error, if failed * @return TRUE if function succeeded */ -extern boolean +extern gboolean merge_append_files(int in_file_count, merge_in_file_t in_files[], merge_out_file_t *out_file, int *err); |