aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2012-06-23 18:56:47 +0200
committerJuanma Barranquero2012-06-23 18:56:47 +0200
commitca300656a5e69cc0b93aab252a4f761539f02c25 (patch)
tree40bdf6be494505ab61b2f9f2a208616f2d1aae89
parentdb7b8d066d675f326a9f2cce7dfd54fbbbeb88a0 (diff)
downloademacs-ca300656a5e69cc0b93aab252a4f761539f02c25.tar.gz
emacs-ca300656a5e69cc0b93aab252a4f761539f02c25.zip
src/w32.c (ltime): Add return type and declare static.
(w32_get_internal_run_time): Remove usused variable `time_100ns'.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 223d9c4bd13..f1099c6ef90 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-06-23 Juanma Barranquero <lekktu@gmail.com>
2
3 * w32.c (ltime): Add return type and declare static.
4 (w32_get_internal_run_time): Remove usused variable `time_100ns'.
5
12012-06-23 Paul Eggert <eggert@cs.ucla.edu> 62012-06-23 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 * sysdep.c [__FreeBSD__]: Fix more recently-introduced typos. 8 * sysdep.c [__FreeBSD__]: Fix more recently-introduced typos.
diff --git a/src/w32.c b/src/w32.c
index 5a36a43302e..b0272c64871 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -333,7 +333,6 @@ w32_get_internal_run_time (void)
333 if ((*get_process_times_fn) (proc, &create, &exit, &kernel, &user)) 333 if ((*get_process_times_fn) (proc, &create, &exit, &kernel, &user))
334 { 334 {
335 LARGE_INTEGER user_int, kernel_int, total; 335 LARGE_INTEGER user_int, kernel_int, total;
336 int time_100ns;
337 user_int.LowPart = user.dwLowDateTime; 336 user_int.LowPart = user.dwLowDateTime;
338 user_int.HighPart = user.dwHighDateTime; 337 user_int.HighPart = user.dwHighDateTime;
339 kernel_int.LowPart = kernel.dwLowDateTime; 338 kernel_int.LowPart = kernel.dwLowDateTime;
@@ -4093,6 +4092,7 @@ restore_privilege (TOKEN_PRIVILEGES *priv)
4093 return ret_val; 4092 return ret_val;
4094} 4093}
4095 4094
4095static Lisp_Object
4096ltime (ULONGLONG time_100ns) 4096ltime (ULONGLONG time_100ns)
4097{ 4097{
4098 ULONGLONG time_sec = time_100ns / 10000000; 4098 ULONGLONG time_sec = time_100ns / 10000000;