* exceptions.cc (dummy_ctrl_c_handler): Remove.
(init_console_handler): Drop has_null_console_handler_routine checks. * fhandler_raw.cc (fhandler_dev_raw::open): Drop has_raw_devices check. * fhandler_serial.cc (fhandler_serial::open): Drop .supports_reading_modem_output_lines check. * miscfuncs.cc (low_priority_sleep): Drop has_switch_to_thread check. * shared.cc (open_shared): Drop needs_memory_protection checks. * spawn.cc (spawn_guts): Drop start_proc_suspended check. * uname.cc (uname): Drop has_valid_processorlevel check. * wincap.cc: Remove has_raw_devices, has_valid_processorlevel, supports_reading_modem_output_lines, needs_memory_protection, has_switch_to_thread, start_proc_suspended and has_null_console_handler_routine throughout. * wincap.h: Ditto.
This commit is contained in:
@ -94,26 +94,17 @@ NO_COPY static struct
|
||||
|
||||
/* Initialization code. */
|
||||
|
||||
BOOL WINAPI
|
||||
dummy_ctrl_c_handler (DWORD)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void
|
||||
init_console_handler (bool install_handler)
|
||||
{
|
||||
BOOL res;
|
||||
|
||||
SetConsoleCtrlHandler (ctrl_c_handler, FALSE);
|
||||
if (wincap.has_null_console_handler_routine ())
|
||||
SetConsoleCtrlHandler (NULL, FALSE);
|
||||
SetConsoleCtrlHandler (NULL, FALSE);
|
||||
if (install_handler)
|
||||
res = SetConsoleCtrlHandler (ctrl_c_handler, TRUE);
|
||||
else if (wincap.has_null_console_handler_routine ())
|
||||
res = SetConsoleCtrlHandler (NULL, TRUE);
|
||||
else
|
||||
res = SetConsoleCtrlHandler (dummy_ctrl_c_handler, TRUE);
|
||||
res = SetConsoleCtrlHandler (NULL, TRUE);
|
||||
if (!res)
|
||||
system_printf ("SetConsoleCtrlHandler failed, %E");
|
||||
}
|
||||
|
Reference in New Issue
Block a user