procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(Fget_internal_run_time) [WINDOWSNT]: Use w32_get_internal_run_time.

Browse source
This commit is contained in:
Jason Rumney 2007-06-14 15:59:58 +00:00
parent 7425851806
commit c433c134bc
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -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

13
src/editfns.c
View file

@ -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 */
}