change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.

Please distclean Win32 builds!

svn path=/trunk/; revision=19814

1 files changed, 1 insertions, 1 deletions

diff --git a/merge.h b/merge.h
index ae2faeffb1..2a0a1bbd9a 100644
--- a/merge.h
+++ b/merge.h
@@ -42,7 +42,7 @@ typedef enum {
 typedef struct merge_in_file_s {
   const char     *filename;
   wtap           *wth;
-  long            data_offset;
+  gint64          data_offset;
   in_file_state_e state;
   gint64          size;		/* file size */
 } merge_in_file_t;