forked from osmocom/wireshark
Try to fix bug 3279 (initialize a time_t to a sane value).
svn path=/trunk/; revision=28055
This commit is contained in:
parent
efbf22009e
commit
d2949c461c
2
merge.c
2
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;
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in New Issue