From: Juanma Barranquero Date: Mon, 17 Feb 2003 08:58:43 +0000 (+0000) Subject: (wait_reading_process_input): Make the 2 patches in wait_reading_process_input X-Git-Tag: emacs-21.3~19 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=405e0b68d2c20760c7083aa109ea5845be4a7b55;p=emacs.git (wait_reading_process_input): Make the 2 patches in wait_reading_process_input for HP-UX 10.10 from AlainF invalid for HP-UX 10.20 and higher. Nevertheless add the stop_polling call to AlainF's patch in wait_reading_process_input so that the code can work under 10.10. --- diff --git a/src/process.c b/src/process.c index 41627376d8b..a89c05aa790 100644 --- a/src/process.c +++ b/src/process.c @@ -2397,14 +2397,15 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) EMACS_SET_SECS_USECS (timeout, time_limit, microsecs); EMACS_ADD_TIME (end_time, end_time, timeout); } -#ifdef hpux +#ifdef POLL_INTERRUPTED_SYS_CALL /* AlainF 5-Jul-1996 HP-UX 10.10 seem to have problems with signals coming in Causes "poll: interrupted system call" messages when Emacs is run in an X window Turn off periodic alarms (in case they are in use) */ + stop_polling (); turn_on_atimers (0); -#endif +#endif /* POLL_INTERRUPTED_SYS_CALL */ while (1) { @@ -2851,14 +2852,14 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) clear_input_pending (); QUIT; } -#ifdef hpux +#ifdef POLL_INTERRUPTED_SYS_CALL /* AlainF 5-Jul-1996 HP-UX 10.10 seems to have problems with signals coming in Causes "poll: interrupted system call" messages when Emacs is run in an X window Turn periodic alarms back on */ start_polling (); -#endif +#endif /* POLL_INTERRUPTED_SYS_CALL */ return got_some_input; }