(Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4342561ae54c20d85dc7ac028364786e20e7b098..d0efb5b46e8e584432b1c612919c35c2e406e54b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-14  Jason Rumney  <jasonr@gnu.org>
+
+       * w32.c (get_process_times_fn): New function pointer.
+       (globals_of_w32): Intialize it if present in kernel32.dll.
+       (w32_get_internal_run_time): New function.
+
+       * editfns.c (Fget_internal_run_time) [WINDOWSNT]: Use it.
+
 2007-06-14  Kenichi Handa  <handa@etlken.m17n.org>
 
        * composite.c (update_compositions): Check the validness of

diff --git a/src/editfns.c b/src/editfns.c
index aca3383943d251b6872907376308d44bd64ec3ad..5fd40ed51c7b40aa60c3e7d815b43d15a0cb2d08 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -84,6 +84,11 @@ extern char **environ;
 
 extern size_t emacs_strftimeu P_ ((char *, size_t, const char *,
                                   const struct tm *, int));
+
+#ifdef WINDOWSNT
+extern Lisp_Object w32_get_internal_run_time ();
+#endif
+
 static int tm_diff P_ ((struct tm *, struct tm *));
 static void find_field P_ ((Lisp_Object, Lisp_Object, Lisp_Object, int *, Lisp_Object, int *));
 static void update_buffer_properties P_ ((int, int));
@@ -1483,9 +1488,13 @@ on systems that do not provide resolution finer than a second.  */)
   return list3 (make_number ((secs >> 16) & 0xffff),
                make_number ((secs >> 0)  & 0xffff),
                make_number (usecs));
-#else
+#else /* ! HAVE_GETRUSAGE  */
+#if WINDOWSNT
+  return w32_get_internal_run_time ();
+#else /* ! WINDOWSNT  */
   return Fcurrent_time ();
-#endif
+#endif /* WINDOWSNT  */
+#endif /* HAVE_GETRUSAGE  */
 }
 \f