From e470da85f7b9426eea03d66086c2822bf29e9b05 Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Thu, 3 Mar 2011 23:37:20 +0000
Subject: Some cleanups, mostly x86_64 compat plus interlocked macros

---
 ptw32_relmillisecs.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'ptw32_relmillisecs.c')

diff --git a/ptw32_relmillisecs.c b/ptw32_relmillisecs.c
index ee4a7e3..dbc30a2 100644
--- a/ptw32_relmillisecs.c
+++ b/ptw32_relmillisecs.c
@@ -34,9 +34,6 @@
  *      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 
-#ifndef _UWIN
-/*#include <process.h> */
-#endif
 #include "pthread.h"
 #include "implement.h"
 #ifndef NEED_FTIME
@@ -94,7 +91,13 @@ ptw32_relmillisecs (const struct timespec * abstime)
 
 #else /* ! NEED_FTIME */
 
+#ifdef _MSC_VER
+  _ftime64_s(&currSysTime);
+#elif defined(__MINGW32__) && __MSVCRT_VERSION__ >= 0x0601
+  _ftime64(&currSysTime);
+#else
   _ftime(&currSysTime);
+#endif
 
   tmpCurrMilliseconds = (int64_t) currSysTime.time * MILLISEC_PER_SEC;
   tmpCurrMilliseconds += (int64_t) currSysTime.millitm;
-- 
cgit v1.2.3