Try to fix bug 3279 (initialize a time_t to a sane value).

svn path=/trunk/; revision=28055

diff --git a/merge.c b/merge.c
index e8b79191e99239883bffeb795939afd0a992f1f1..6e83e7ddac9e5549f713a9599c66109262caebb3 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 = {(time_t)LONG_MAX, INT_MAX};
+  struct wtap_nstime tv = { sizeof(time_t) > sizeof(int) ? LONG_MAX : INT_MAX, INT_MAX };
   struct wtap_pkthdr *phdr;
 
   /*