diff options
author | Eli Zaretskii <[email protected]> | 2010-03-20 07:14:01 -0400 |
---|---|---|
committer | Eli Zaretskii <[email protected]> | 2010-03-20 07:14:01 -0400 |
commit | f2cdb04ac04fb8f9f92bce11df6e4a020720208b (patch) | |
tree | 4d231ff66e4145ce8967ed0c4ab71b364d05675f /src/s/usg5-4.h | |
parent | 8eef7665fa98baae93da5151c27ca0db4d1d6f5b (diff) | |
parent | 22e8757456ea6608246d9c81a83f6c5119f2e1fb (diff) |
Merge from mainline.
Diffstat (limited to 'src/s/usg5-4.h')
-rw-r--r-- | src/s/usg5-4.h | 29 |
1 files changed, 1 insertions, 28 deletions
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h index c611911b0e..180045cb7c 100644 --- a/src/s/usg5-4.h +++ b/src/s/usg5-4.h @@ -63,13 +63,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* Special hacks needed to make Emacs run on this system. */ -/* - * Make the sigsetmask function go away. Don't know what the - * ramifications of this are, but doesn't seem possible to - * emulate it properly anyway at this point. - */ - -#define sigsetmask(mask) /* Null expansion */ +#define POSIX_SIGNALS /* setjmp and longjmp can safely replace _setjmp and _longjmp, but they will run slower. */ @@ -176,27 +170,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define PTY_NAME_SPRINTF strcpy (pty_name, "/dev/ptmx"); -/* This sets the name of the slave side of the PTY. On SysVr4, - grantpt(3) forks a subprocess, so keep sigchld_handler() from - intercepting that death. If any child but grantpt's should die - within, it should be caught after sigrelse(2). */ - -#define PTY_TTY_NAME_SPRINTF \ - { \ - char *ptsname (), *ptyname; \ - \ - sighold (SIGCLD); \ - if (grantpt (fd) == -1) \ - { emacs_close (fd); return -1; } \ - sigrelse (SIGCLD); \ - if (unlockpt (fd) == -1) \ - { emacs_close (fd); return -1; } \ - if (!(ptyname = ptsname (fd))) \ - { emacs_close (fd); return -1; } \ - strncpy (pty_name, ptyname, sizeof (pty_name)); \ - pty_name[sizeof (pty_name) - 1] = 0; \ - } - /* Push various streams modules onto a PTY channel. */ #define SETUP_SLAVE_PTY \ |