summaryrefslogtreecommitdiff
path: root/ptw32_relmillisecs.c
diff options
context:
space:
mode:
authorrpj <rpj>2011-06-29 06:19:26 +0000
committerrpj <rpj>2011-06-29 06:19:26 +0000
commit5fdebbca2831af55fcd17d1819ec68dc17e2ec58 (patch)
treeafc3ee148258f406a98c78e801b5c58ef551ac00 /ptw32_relmillisecs.c
parent3f334b78ab4447a37ed40b34c5fdd1aac76d3df7 (diff)
See the ChangeLog
Diffstat (limited to 'ptw32_relmillisecs.c')
-rw-r--r--ptw32_relmillisecs.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ptw32_relmillisecs.c b/ptw32_relmillisecs.c
index c9224ff..894d5c9 100644
--- a/ptw32_relmillisecs.c
+++ b/ptw32_relmillisecs.c
@@ -57,7 +57,8 @@ ptw32_relmillisecs (const struct timespec * abstime)
FILETIME ft;
SYSTEMTIME st;
#else /* ! NEED_FTIME */
-#if (defined(__MINGW64__) || defined(__MINGW32__)) && __MSVCRT_VERSION__ >= 0x0601
+#if ( defined(_MSC_VER) && _MSC_VER >= 1300 ) || \
+ ( (defined(__MINGW64__) || defined(__MINGW32__)) && __MSVCRT_VERSION__ >= 0x0601 )
struct __timeb64 currSysTime;
#else
struct _timeb currSysTime;
@@ -98,9 +99,10 @@ ptw32_relmillisecs (const struct timespec * abstime)
#else /* ! NEED_FTIME */
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && _MSC_VER >= 1400
_ftime64_s(&currSysTime);
-#elif (defined(__MINGW64__) || defined(__MINGW32__)) && __MSVCRT_VERSION__ >= 0x0601
+#elif ( defined(_MSC_VER) && _MSC_VER >= 1300 ) || \
+ ( (defined(__MINGW64__) || defined(__MINGW32__)) && __MSVCRT_VERSION__ >= 0x0601 )
_ftime64(&currSysTime);
#else
_ftime(&currSysTime);