aboutsummaryrefslogtreecommitdiffstats
path: root/epan/to_str.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2013-01-04 14:56:27 +0000
committerPascal Quantin <pascal.quantin@gmail.com>2013-01-04 14:56:27 +0000
commitdeb4f08cb21d8a5306b325d811c3448b46ad18d0 (patch)
treedebe45890e10da566d54d23c05c9f7ce7ef8d9e1 /epan/to_str.c
parent38fdbeeb7e31ca0916ec1626c0fc02629fba0e18 (diff)
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8105 :
Allow use of huges values for localtime / ctime / gmtime with MSVC 2008 or later svn path=/trunk/; revision=46930
Diffstat (limited to 'epan/to_str.c')
-rw-r--r--epan/to_str.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/to_str.c b/epan/to_str.c
index e25675647b..601b898548 100644
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -571,7 +571,7 @@ abs_time_to_str(const nstime_t *abs_time, const absolute_time_display_e fmt,
const char *zonename = "???";
gchar *buf = NULL;
-#ifdef _MSC_VER
+#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 */
@@ -655,7 +655,7 @@ abs_time_secs_to_str(const time_t abs_time, const absolute_time_display_e fmt,
const char *zonename = "???";
gchar *buf = NULL;
-#ifdef _MSC_VER
+#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 */