3 files changed, 5 insertions, 1 deletions
diff --git a/Changes b/Changes
index ce13752..901190f 100644
--- a/Changes
+++ b/Changes
@@ -7,6 +7,8 @@ TODO: remain
         - honor autoconf detection of EV_USE_CLOCK_SYSCALL, also double-
           check that the syscall number is available before trying to
           use it (reported by ry@tinyclouds).
+        - use GetSysTimeAsFileTime instead of _timeb on windows, for
+          slightly higher accuracy.
 
 3.6  Tue Apr 28 02:49:30 CEST 2009
 	- multiple timers becoming ready within an event loop iteration
diff --git a/ev.c b/ev.c
index 03fd014..5d86f37 100644
--- a/ev.c
+++ b/ev.c
@@ -566,6 +566,7 @@ typedef struct
 
 /*****************************************************************************/
 
+#ifndef EV_HAVE_EV_TIME
 ev_tstamp
 ev_time (void)
 {
@@ -582,6 +583,7 @@ ev_time (void)
   gettimeofday (&tv, 0);
   return tv.tv_sec + tv.tv_usec * 1e-6;
 }
+#endif
 
 inline_size ev_tstamp
 get_clock (void)
diff --git a/ev_win32.c b/ev_win32.c
index 727c686..a048c0b 100644
--- a/ev_win32.c
+++ b/ev_win32.c
@@ -146,7 +146,7 @@ ev_time (void)
   ui.u.HighPart = ft.dwHighDateTime;
 
   /* msvc cannot convert ulonglong to double... yes, it is that sucky */
-  return (__int64)(ui.QuadPart - 116444736000000000) * 1e-7;
+  return (LONGLONG)(ui.QuadPart - 116444736000000000) * 1e-7;
 }
 
 #endif