From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 19 May 2017 08:05:59 +0000 (+0300)
Subject: Avoid MinGW compilation warning in readline/input.c
X-Git-Tag: users/hjl/linux/release/2.28.51.0.1~1^2~28^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50e1d299ef1d21b0833c2fe1484d3cc374e6486f;p=thirdparty%2Fbinutils-gdb.git

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.
---

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>