2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 46f086389fe..ff3e74d547a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-11  Juanma Barranquero  <lekktu@gmail.com>
+
+        * xdisp.c (start_hourglass) [HAVE_NTGUI]: Add block to silence
+        warning about mixing declarations and code in ISO C90.
+
 2012-11-10  Martin Rudalics  <rudalics@gmx.at>
 
         * window.c (Fsplit_window_internal): Set combination limit of
diff --git a/src/xdisp.c b/src/xdisp.c
index 46d942ce441..968c23c0944 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -29420,8 +29420,10 @@ start_hourglass (void)
     delay = make_emacs_time (DEFAULT_HOURGLASS_DELAY, 0);
 
 #ifdef HAVE_NTGUI
-  extern void w32_note_current_window (void);
-  w32_note_current_window ();
+  {
+    extern void w32_note_current_window (void);
+    w32_note_current_window ();
+  }
 #endif /* HAVE_NTGUI */
 
   hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,