Use val_to_str_const().

[obnox/wireshark/wip.git] / merge.h

diff --git a/merge.h b/merge.h
index 887e1b866cec44969568ea492d42f996a1549024..2a0a1bbd9a4f33973d0ab77e9025e8982fed2617 100644 (file)
--- a/merge.h
+++ b/merge.h
@@ -3,8 +3,8 @@
  *
  * $Id$
  *
- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
@@ -42,9 +42,9 @@ typedef enum {
 typedef struct merge_in_file_s {
   const char     *filename;
   wtap           *wth;
-  long            data_offset;
+  gint64          data_offset;
   in_file_state_e state;
-  long            size;                /* file size */
+  gint64          size;                /* file size */
 } merge_in_file_t;
 
 /** Open a number of input files to merge.