aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2013-02-16 15:59:37 +0200
committerEli Zaretskii2013-02-16 15:59:37 +0200
commitcd91fb4b0ae2c05d72adb61bc47c232c2dad015a (patch)
tree76e23eb7e8d05d9a26e66fcb6c16b61e76b381bc /src
parentf277993be3a50b375c670351cb4051c806edd97f (diff)
downloademacs-cd91fb4b0ae2c05d72adb61bc47c232c2dad015a.tar.gz
emacs-cd91fb4b0ae2c05d72adb61bc47c232c2dad015a.zip
Don't use __STDC__ on MS-Windows unless necessary (Bug #9066).
nt/inc/ms-w32.h (__STDC__): Fiddle with value only for MSVC. src/w32term.c <input_signal_count>: Declare 'volatile' unconditionally.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/w32term.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d326532ecb7..797a02b8f73 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12013-02-16 Eli Zaretskii <eliz@gnu.org> 12013-02-16 Eli Zaretskii <eliz@gnu.org>
2 2
3 * w32term.c <input_signal_count>: Declare 'volatile'
4 unconditionally. (Bug#9066)
5
3 * w32.c (set_errno): Reset h_errno and don't set it to any other 6 * w32.c (set_errno): Reset h_errno and don't set it to any other
4 value. Set errno instead. 7 value. Set errno instead.
5 (check_errno): Reset h_errno. 8 (check_errno): Reset h_errno.
diff --git a/src/w32term.c b/src/w32term.c
index c83ee31d200..170f33ecd67 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -191,11 +191,7 @@ static Time last_mouse_movement_time;
191 191
192/* Incremented by w32_read_socket whenever it really tries to read 192/* Incremented by w32_read_socket whenever it really tries to read
193 events. */ 193 events. */
194#ifdef __STDC__
195static int volatile input_signal_count; 194static int volatile input_signal_count;
196#else
197static int input_signal_count;
198#endif
199 195
200#ifdef CYGWIN 196#ifdef CYGWIN
201int w32_message_fd = -1; 197int w32_message_fd = -1;