diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-01-26 12:56:32 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2014-01-26 12:56:32 +0000 |
| commit | c6022b3b85dedeae9465e5bb2fe38fdb35f21ee9 (patch) | |
| tree | ea4721d3fe3f1cb11b424f5cfe2c5b2f9d301572 /wiretap | |
| parent | 47f50d13ceff8f560b3fe02ed0084e4bd205e576 (diff) | |
Drop support of Visual Studio 2005
* Remove _MSC_VER < 1500 check
* Cleanup config.nmake
See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html
svn path=/trunk/; revision=54965
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/k12text.l | 8 | ||||
| -rw-r--r-- | wiretap/ngsniffer.c | 8 |
2 files changed, 0 insertions, 16 deletions
diff --git a/wiretap/k12text.l b/wiretap/k12text.l index afdc267cba..584c43cfdb 100644 --- a/wiretap/k12text.l +++ b/wiretap/k12text.l @@ -402,14 +402,6 @@ k12text_dump(wtap_dumper *wdh _U_, const struct wtap_pkthdr *phdr, ms = phdr->ts.nsecs / 1000000; ns = (phdr->ts.nsecs - (1000000*ms))/1000; -#if (defined _WIN32) && (_MSC_VER < 1500) - /* calling gmtime() on MSVC 2005 with huge values causes it to crash */ - /* XXX - find the exact value that still does work */ - /* XXX - using _USE_32BIT_TIME_T might be another way to circumvent this problem */ - if (phdr->ts.secs > 2000000000) - tmp = NULL; - else -#endif tmp = gmtime(&phdr->ts.secs); if (tmp == NULL) g_snprintf(p, 90, "+---------+---------------+----------+\r\nXX:XX:XX,"); diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index 58031ff38e..1ac1860140 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -2088,14 +2088,6 @@ ngsniffer_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, date. */ if (ngsniffer->first_frame) { ngsniffer->first_frame=FALSE; -#if (defined _WIN32) && (_MSC_VER < 1500) - /* calling localtime() on MSVC 2005 with huge values causes it to crash */ - /* XXX - find the exact value that still does work */ - /* XXX - using _USE_32BIT_TIME_T might be another way to circumvent this problem */ - if (phdr->ts.secs > 2000000000) - tm = NULL; - else -#endif tm = localtime(&phdr->ts.secs); if (tm != NULL && tm->tm_year >= DOS_YEAR_OFFSET) { start_date = (tm->tm_year - DOS_YEAR_OFFSET) << DOS_YEAR_SHIFT; |