diff options
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c index 84d48689d8f..dd9c6dbcb42 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -48,7 +48,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ | |||
| 48 | 48 | ||
| 49 | #if defined(BSD) || defined(STRIDE) | 49 | #if defined(BSD) || defined(STRIDE) |
| 50 | #include <sys/ioctl.h> | 50 | #include <sys/ioctl.h> |
| 51 | #if !defined (O_NDELAY) && defined (HAVE_PTYS) | 51 | #if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5) |
| 52 | #include <fcntl.h> | 52 | #include <fcntl.h> |
| 53 | #endif /* HAVE_PTYS and no O_NDELAY */ | 53 | #endif /* HAVE_PTYS and no O_NDELAY */ |
| 54 | #endif /* BSD or STRIDE */ | 54 | #endif /* BSD or STRIDE */ |
| @@ -119,7 +119,6 @@ static Lisp_Object stream_process; | |||
| 119 | #ifndef VMS | 119 | #ifndef VMS |
| 120 | #ifndef WAITTYPE | 120 | #ifndef WAITTYPE |
| 121 | #if !defined (BSD) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER) | 121 | #if !defined (BSD) && !defined (UNIPLUS) && !defined (STRIDE) && !(defined (HPUX) && !defined (NOMULTIPLEJOBS)) && !defined (HAVE_WAIT_HEADER) |
| 122 | mis;tak-+;;: | ||
| 123 | #define WAITTYPE int | 122 | #define WAITTYPE int |
| 124 | #define WIFSTOPPED(w) ((w&0377) == 0177) | 123 | #define WIFSTOPPED(w) ((w&0377) == 0177) |
| 125 | #define WIFSIGNALED(w) ((w&0377) != 0177 && (w&~0377) == 0) | 124 | #define WIFSIGNALED(w) ((w&0377) != 0177 && (w&~0377) == 0) |
| @@ -1796,7 +1795,7 @@ wait_reading_process_input (time_limit, microsecs, read_kbd, do_display) | |||
| 1796 | Available &= ~(ChannelMask (comm_server)); | 1795 | Available &= ~(ChannelMask (comm_server)); |
| 1797 | create_commchan (); | 1796 | create_commchan (); |
| 1798 | } | 1797 | } |
| 1799 | #endif vipc | 1798 | #endif /* vipc */ |
| 1800 | 1799 | ||
| 1801 | if (! wait_proc) | 1800 | if (! wait_proc) |
| 1802 | got_some_input |= nfds > 0; | 1801 | got_some_input |= nfds > 0; |
| @@ -2245,10 +2244,12 @@ process_send_signal (process, signo, current_group, nomsg) | |||
| 2245 | ioctl (XFASTINT (p->infd), TIOCGETC, &c); | 2244 | ioctl (XFASTINT (p->infd), TIOCGETC, &c); |
| 2246 | send_process (proc, &c.t_quitc, 1); | 2245 | send_process (proc, &c.t_quitc, 1); |
| 2247 | return Qnil; | 2246 | return Qnil; |
| 2247 | #ifdef SIGTSTP | ||
| 2248 | case SIGTSTP: | 2248 | case SIGTSTP: |
| 2249 | ioctl (XFASTINT (p->infd), TIOCGLTC, &lc); | 2249 | ioctl (XFASTINT (p->infd), TIOCGLTC, &lc); |
| 2250 | send_process (proc, &lc.t_suspc, 1); | 2250 | send_process (proc, &lc.t_suspc, 1); |
| 2251 | return Qnil; | 2251 | return Qnil; |
| 2252 | #endif /* SIGTSTP */ | ||
| 2252 | } | 2253 | } |
| 2253 | #endif /* ! defined (TIOCGLTC) && defined (TIOCGETC) */ | 2254 | #endif /* ! defined (TIOCGLTC) && defined (TIOCGETC) */ |
| 2254 | /* It is possible that the following code would work | 2255 | /* It is possible that the following code would work |