* src/toolbox/util.c (util_current_time_millis): Removed.

* src/toolbox/util.h: Likewise.

* src/vm/vm.c (vm_create): Use builtin_currenttimemillis instead of
util_current_time_millis.

diff --git a/src/toolbox/util.c b/src/toolbox/util.c
index e340742c882de4edb91cfd23456f15624ef026d5..548823e1e687726f71f42ab22613ced6c46f0d20 100644 (file)
--- a/src/toolbox/util.c
+++ b/src/toolbox/util.c
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: util.c 5126 2006-07-12 22:55:05Z twisti $
+   $Id: util.c 5252 2006-08-18 13:07:21Z twisti $
 
 */
 
@@ -39,7 +39,6 @@
 #include <errno.h>
 #include <stdarg.h>
 #include <unistd.h>
-#include <sys/time.h>
 
 #include "vm/types.h"
 
@@ -139,28 +138,6 @@ int get_variable_message_length(const char *fmt, va_list ap)
 }
 
 
-/* util_current_time_millis ****************************************************
-
-   Return the current time in milliseconds.
-
-*******************************************************************************/
-
-s8 util_current_time_millis(void)
-{
-       struct timeval tv;
-       s8             result;
-
-       if (gettimeofday(&tv, NULL) == -1)
-               vm_abort("gettimeofday failed: %s", strerror(errno));
-
-       result = (s8) tv.tv_sec;
-       result *= 1000;
-       result += (tv.tv_usec / 1000);
-
-       return result;
-}
-
-
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where

diff --git a/src/toolbox/util.h b/src/toolbox/util.h
index d5671e86b40b7b71b2dab1cf8c49abc38d148cc1..afc68f0605a1fbf74e944537cee51c83912decb7 100644 (file)
--- a/src/toolbox/util.h
+++ b/src/toolbox/util.h
@@ -28,7 +28,7 @@
 
    Changes:
 
-   $Id: util.h 5104 2006-07-10 17:22:18Z twisti $
+   $Id: util.h 5252 2006-08-18 13:07:21Z twisti $
 
 */
 
@@ -47,7 +47,6 @@
 
 char *_Jv_getcwd(void);
 int   get_variable_message_length(const char *fmt, va_list ap);
-s8    util_current_time_millis(void);
 
 #endif /* _UTIL_H */
 

diff --git a/src/vm/vm.c b/src/vm/vm.c
index e0e34793adf288e6e5645f7f40b3ccba3d8ba537..6eb3dad0b32c2b3d9a2ecd5ab98d40e950e1b23a 100644 (file)
--- a/src/vm/vm.c
+++ b/src/vm/vm.c
@@ -49,7 +49,6 @@
 # include "threads/native/threads.h"
 #endif
 
-#include "toolbox/util.h"
 #include "vm/classcache.h"
 #include "vm/exceptions.h"
 #include "vm/finalizer.h"
@@ -588,7 +587,7 @@ bool vm_create(JavaVMInitArgs *vm_args)
 
        /* set the VM starttime */
 
-       _Jv_jvm->starttime = util_current_time_millis();
+       _Jv_jvm->starttime = builtin_currenttimemillis();
 
        /* get stuff from the environment *****************************************/