summaryrefslogtreecommitdiff
path: root/readline
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2017-05-19 11:05:59 +0300
committerEli Zaretskii <eliz@gnu.org>2017-05-19 11:05:59 +0300
commit50e1d299ef1d21b0833c2fe1484d3cc374e6486f (patch)
tree9ddacbfe2223a0905881b984b5a104f0a934f39a /readline
parentdd47d677f0164800ceba1ab67f6cd2add0021101 (diff)
downloadbinutils-gdb-50e1d299ef1d21b0833c2fe1484d3cc374e6486f.tar.gz
Avoid MinGW compilation warning in readline/input.c
This change was already accepted upstream in Readline. readline/ChangeLog.gdb: 2017-05-19 Eli Zaretskii <eliz@gnu.org> * input.c [_WIN32]: Include <conio.h> to avoid compiler warning on MinGW.
Diffstat (limited to 'readline')
-rw-r--r--readline/ChangeLog.gdb5
-rw-r--r--readline/input.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index 91e1dbd11bc..f05b9dc52c2 100644
--- a/readline/ChangeLog.gdb
+++ b/readline/ChangeLog.gdb
@@ -1,3 +1,8 @@
+2017-05-19 Eli Zaretskii <eliz@gnu.org>
+
+ * input.c [_WIN32]: Include <conio.h> to avoid compiler warning on
+ MinGW.
+
2016-09-17 Eli Zaretskii <eliz@gnu.org>
* util.c: Include rlshell.h.
diff --git a/readline/input.c b/readline/input.c
index e35277fd2df..c00bce77a74 100644
--- a/readline/input.c
+++ b/readline/input.c
@@ -91,6 +91,7 @@ static int rl_gather_tyi PARAMS((void));
/* 'isatty' in the Windows runtime returns non-zero for every
character device, including the null device. Repair that. */
#include <io.h>
+#include <conio.h>
#define WIN32_LEAN_AND_MEAN 1
#include <windows.h>