aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2012-11-11 15:19:13 +0100
committerJuanma Barranquero2012-11-11 15:19:13 +0100
commit11235c037ff77b67e221e348e65afd85db7b7f2d (patch)
treeb3eb8c80a237d50f05a239d37b988be32354f710 /src
parentc02ed5ace85372fedd4836fe1a33fa22927e7065 (diff)
downloademacs-11235c037ff77b67e221e348e65afd85db7b7f2d.tar.gz
emacs-11235c037ff77b67e221e348e65afd85db7b7f2d.zip
src/xdisp.c (start_hourglass) [HAVE_NTGUI]: Silence warning.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xdisp.c6
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 @@
12012-11-11 Juanma Barranquero <lekktu@gmail.com>
2
3 * xdisp.c (start_hourglass) [HAVE_NTGUI]: Add block to silence
4 warning about mixing declarations and code in ISO C90.
5
12012-11-10 Martin Rudalics <rudalics@gmx.at> 62012-11-10 Martin Rudalics <rudalics@gmx.at>
2 7
3 * window.c (Fsplit_window_internal): Set combination limit of 8 * 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)
29420 delay = make_emacs_time (DEFAULT_HOURGLASS_DELAY, 0); 29420 delay = make_emacs_time (DEFAULT_HOURGLASS_DELAY, 0);
29421 29421
29422#ifdef HAVE_NTGUI 29422#ifdef HAVE_NTGUI
29423 extern void w32_note_current_window (void); 29423 {
29424 w32_note_current_window (); 29424 extern void w32_note_current_window (void);
29425 w32_note_current_window ();
29426 }
29425#endif /* HAVE_NTGUI */ 29427#endif /* HAVE_NTGUI */
29426 29428
29427 hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay, 29429 hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,