summaryrefslogtreecommitdiff
path: root/ptw32_relmillisecs.c
diff options
context:
space:
mode:
authorrpj <rpj>2011-03-03 23:37:20 +0000
committerrpj <rpj>2011-03-03 23:37:20 +0000
commite470da85f7b9426eea03d66086c2822bf29e9b05 (patch)
treeb3747768258dc62752612327904be1f1067d5c7f /ptw32_relmillisecs.c
parent1170175259781ece4a8d99d517230f4b9ecb7b50 (diff)
Some cleanups, mostly x86_64 compat plus interlocked macros
Diffstat (limited to 'ptw32_relmillisecs.c')
-rw-r--r--ptw32_relmillisecs.c9
1 files changed, 6 insertions, 3 deletions
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;