The first component of a "wtap_nstime" is a "time_t", which could be an

"int" or a "long"; initialize it with LONG_MAX cast to "time_t".

The second argument is an "int"; initialize it with INT_MAX.

svn path=/trunk/; revision=23764

1 files changed, 1 insertions, 1 deletions

diff --git a/merge.c b/merge.c
index 8fd1c63af0..e8b79191e9 100644
--- a/merge.c
+++ b/merge.c
@@ -157,7 +157,7 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[], int *err,
 {
   int i;
   int ei = -1;
-  struct wtap_nstime tv = {LONG_MAX, LONG_MAX};
+  struct wtap_nstime tv = {(time_t)LONG_MAX, INT_MAX};
   struct wtap_pkthdr *phdr;
 
   /*