summaryrefslogtreecommitdiff
path: root/src/w32.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/w32.c')
-rw-r--r--src/w32.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/w32.c b/src/w32.c
index f365616db2b..d34ab70f82d 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -9414,7 +9414,7 @@ sys_write (int fd, const void * buffer, unsigned int count)
errno = 0;
while (count > 0)
{
- unsigned this_chunk = count < chunk ? count : chunk;
+ unsigned this_chunk = min (count, chunk);
int n = _write (fd, p, this_chunk);
if (n > 0)
@@ -10392,11 +10392,16 @@ check_windows_init_file (void)
}
}
+/* from w32fns.c */
+extern void remove_w32_kbdhook (void);
+
void
term_ntproc (int ignored)
{
(void)ignored;
+ remove_w32_kbdhook ();
+
term_timers ();
/* shutdown the socket interface if necessary */