hotspot/src/os/windows/vm/os_windows.cpp
changeset 235 735f15bdea80
parent 193 171c404abf72
parent 234 4da9c1bbc810
child 252 050143a0dbfb
--- a/hotspot/src/os/windows/vm/os_windows.cpp	Thu Mar 13 14:17:48 2008 -0700
+++ b/hotspot/src/os/windows/vm/os_windows.cpp	Thu Mar 20 09:17:30 2008 -0500
@@ -737,20 +737,13 @@
   return result;
 }
 
-jlong os::timeofday() {
-  FILETIME wt;
-  GetSystemTimeAsFileTime(&wt);
-  return windows_to_java_time(wt);
-}
-
-
-// Must return millis since Jan 1 1970 for JVM_CurrentTimeMillis
-// _use_global_time is only set if CacheTimeMillis is true
 jlong os::javaTimeMillis() {
   if (UseFakeTimers) {
     return fake_time++;
   } else {
-    return (_use_global_time ? read_global_time() : timeofday());
+    FILETIME wt;
+    GetSystemTimeAsFileTime(&wt);
+    return windows_to_java_time(wt);
   }
 }