diff options
author | Gerald Combs <gerald@wireshark.org> | 2009-04-15 16:02:35 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2009-04-15 16:02:35 +0000 |
commit | d2949c461cb3f4a83af895815eafb3af1667a49a (patch) | |
tree | 7906bc4a016ce4ab36d83721ed83f8aa2fc7b035 /merge.c | |
parent | efbf22009eb4a049a2b146386c12384c288078b7 (diff) |
Try to fix bug 3279 (initialize a time_t to a sane value).
svn path=/trunk/; revision=28055
Diffstat (limited to 'merge.c')
-rw-r--r-- | merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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; /* |