2 files changed, 4 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b2502010619..cb17e8192e4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-10-05  Eli Zaretskii  <eliz@gnu.org>
 
+        * w32proc.c (stop_timer_thread): Fix declaration of 'err'.
+
         * w32.c (utime): Open the file with FILE_FLAG_BACKUP_SEMANTICS, so
         that time stamps of directories could also be changed.  Don't
         request the too broad GENERIC_WRITE, only the more restrictive
diff --git a/src/w32proc.c b/src/w32proc.c
index 56a60fbf25f..d032b21c59e 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -404,8 +404,8 @@ stop_timer_thread (int which)
   struct itimer_data *itimer =
     (which == ITIMER_REAL) ? &real_itimer : &prof_itimer;
   int i;
-  DWORD exit_code = 255;
-  BOOL status, err;
+  DWORD err, exit_code = 255;
+  BOOL status;
 
   /* Signal the thread that it should terminate.  */
   itimer->terminate = 1;