From Vladimir Koutny:

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

diff --git a/merge.c b/merge.c
index 8fd1c63af097a46bc1534ef5698afff30176de55..e8b79191e99239883bffeb795939afd0a992f1f1 100644 (file)
--- 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;
 
   /*