darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove some extraneous changes in readline/terminal.c

Browse source 
This patch removes some unnecessary differences between the official
version of readline, and GDB's copy of it.

readline/ChangeLog.gdb:

        * terminal.c: Remove duplicate includes of windows.h and
        wincon.h.
        (_rl_get_screen_size): Remove redundant code for MinGW getting
        the console size from the Windows API.
This commit is contained in:
Joel Brobecker 2012-10-18 18:55:41 +00:00
parent a29a8af823
commit f462b01f69
2 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
readline/ChangeLog.gdb
View file

@ -1,3 +1,10 @@
2012-10-18 Joel Brobecker <brobecker@adacore.com>
* terminal.c: Remove duplicate includes of windows.h and
wincon.h.
(_rl_get_screen_size): Remove redundant code for MinGW getting
the console size from the Windows API.
2012-02-24 Pierre Muller <muller@ics.u-strasbg.fr>
* signals.c (_rl_block_sigwinch, _rl_release_sigwinch): Add

19
readline/terminal.c
View file

@ -81,11 +81,6 @@ static void _win_get_screensize PARAMS((int *, int *));
static void _emx_get_screensize PARAMS((int *, int *));
#endif
#if defined (__MINGW32__)
# include <windows.h>
# include <wincon.h>
#endif
#define CUSTOM_REDISPLAY_FUNC() (rl_redisplay_function != rl_redisplay)
#define CUSTOM_INPUT_FUNC() (rl_getc_function != rl_getc)
@ -250,20 +245,6 @@ _rl_get_screen_size (tty, ignore_env)
}
#endif /* TIOCGWINSZ */
/* For MinGW, we get the console size from the Windows API. */
#if defined (__MINGW32__)
HANDLE hConOut = GetStdHandle (STD_OUTPUT_HANDLE);
if (hConOut != INVALID_HANDLE_VALUE)
{
CONSOLE_SCREEN_BUFFER_INFO scr;
if (GetConsoleScreenBufferInfo (hConOut, &scr))
{
wc = scr.dwSize.X;
wr = scr.srWindow.Bottom - scr.srWindow.Top + 1;
}
}
#endif
#if defined (__EMX__)
_emx_get_screensize (&wc, &wr);
#elif defined (__MINGW32__)