https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=b92b47b7bc3993bf674ba5a174b738a6d523c95c
commit b92b47b7bc3993bf674ba5a174b738a6d523c95c Author: John Hood <[email protected]> Date: Sat Jan 30 17:33:36 2016 -0500 Move get_nonascii_key into fhandler_console. * fhandler.h (fhandler_console): Move get_nonascii_key() from select.c into this class. * select.cc (peek_console): Move get_nonascii_key() into fhandler_console class. Diff: --- winsup/cygwin/fhandler.h | 1 + winsup/cygwin/fhandler_console.cc | 4 +--- winsup/cygwin/select.cc | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 4b8efee..4610557 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1469,6 +1469,7 @@ private: bool set_unit (); static bool need_invisible (); static void free_console (); + static const char *get_nonascii_key (INPUT_RECORD& input_rec, char *); fhandler_console (void *) {} diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 41af223..c510d70 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -46,8 +46,6 @@ details. */ #define srTop (con.b.srWindow.Top + con.scroll_region.Top) #define srBottom ((con.scroll_region.Bottom < 0) ? con.b.srWindow.Bottom : con.b.srWindow.Top + con.scroll_region.Bottom) -const char *get_nonascii_key (INPUT_RECORD&, char *); - const unsigned fhandler_console::MAX_WRITE_CHARS = 16384; fhandler_console::console_state NO_COPY *fhandler_console::shared_console_info; @@ -2389,7 +2387,7 @@ static const struct { }; const char * -get_nonascii_key (INPUT_RECORD& input_rec, char *tmp) +fhandler_console::get_nonascii_key (INPUT_RECORD& input_rec, char *tmp) { #define NORMAL 0 #define SHIFT 1 diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index 1f3276c..272d08a 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -839,7 +839,6 @@ fhandler_fifo::select_except (select_stuff *ss) static int peek_console (select_record *me, bool) { - extern const char * get_nonascii_key (INPUT_RECORD& input_rec, char *); fhandler_console *fh = (fhandler_console *) me->fh; if (!me->read_selected) @@ -881,7 +880,7 @@ peek_console (select_record *me, bool) { if (irec.Event.KeyEvent.bKeyDown && (irec.Event.KeyEvent.uChar.AsciiChar - || get_nonascii_key (irec, tmpbuf))) + || fhandler_console::get_nonascii_key (irec, tmpbuf))) return me->read_ready = true; } else
