This is the mail archive of the gdb-cvs@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[binutils-gdb/gdb-8.0-branch] Avoid MinGW compilation warning in readline/input.c


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=958d57d02d936913a4f9d54810ee0fceb763aa35

commit 958d57d02d936913a4f9d54810ee0fceb763aa35
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Fri May 19 11:05:59 2017 +0300

    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.
    
    (cherry picked from commit 50e1d299ef1d21b0833c2fe1484d3cc374e6486f)

Diff:
---
 readline/ChangeLog.gdb | 5 +++++
 readline/input.c       | 1 +
 2 files changed, 6 insertions(+)

diff --git a/readline/ChangeLog.gdb b/readline/ChangeLog.gdb
index 91e1dbd..f05b9dc 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 e35277f..c00bce7 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>


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]