diff options
author | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2002-10-29 10:16:02 +0000 |
commit | 279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a (patch) | |
tree | 404fa392fc6f2560e3c459fa20228c7031d0289d /crypto/openssh/sshpty.c | |
parent | ce26c10eda4d687d476e9bbac51ccd26564af8da (diff) | |
download | FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.zip FreeBSD-src-279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/sshpty.c')
-rw-r--r-- | crypto/openssh/sshpty.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/openssh/sshpty.c b/crypto/openssh/sshpty.c index 14a01b7..dad1b16 100644 --- a/crypto/openssh/sshpty.c +++ b/crypto/openssh/sshpty.c @@ -163,7 +163,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) } return 1; #else /* HAVE_DEV_PTS_AND_PTC */ -#ifdef _CRAY +#ifdef _UNICOS char buf[64]; int i; int highpty; @@ -269,7 +269,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) void *old; #endif /* USE_VHANGUP */ -#ifdef _CRAY +#ifdef _UNICOS if (setsid() < 0) error("setsid: %.100s", strerror(errno)); @@ -291,7 +291,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) error("%.100s: %.100s", ttyname, strerror(errno)); close(*ttyfd); *ttyfd = fd; -#else /* _CRAY */ +#else /* _UNICOS */ /* First disconnect from the old controlling tty. */ #ifdef TIOCNOTTY @@ -346,7 +346,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname) strerror(errno)); else close(fd); -#endif /* _CRAY */ +#endif /* _UNICOS */ } /* Changes the window size associated with the pty. */ |