summaryrefslogtreecommitdiff
path: root/sshpty.c
diff options
context:
space:
mode:
authormouring <mouring>2002-07-22 23:34:25 +0000
committermouring <mouring>2002-07-22 23:34:25 +0000
commit25ccbe711a04821e86fb7cc5dec0cc77787f7cd7 (patch)
treea6e48d8958ba031a5c81e367e42a97a774493945 /sshpty.c
parent5568f64083c89940c05803b3bf239d120f9c4fdf (diff)
downloadopenssh-25ccbe711a04821e86fb7cc5dec0cc77787f7cd7.tar.gz
- (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync
with Cray (mostly #ifdef renaming). Patch by wendyp@cray.com.
Diffstat (limited to 'sshpty.c')
-rw-r--r--sshpty.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshpty.c b/sshpty.c
index 64ac4e59..e3027ca2 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -162,7 +162,7 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
}
return 1;
#else /* HAVE_DEV_PTS_AND_PTC */
-#ifdef _CRAY
+#if defined(_CRAY) && !defined(_CRAYSV2)
char buf[64];
int i;
int highpty;
@@ -268,7 +268,7 @@ pty_make_controlling_tty(int *ttyfd, const char *ttyname)
void *old;
#endif /* USE_VHANGUP */
-#ifdef _CRAY
+#if defined(_CRAY) && !defined(_CRAYSV2)
if (setsid() < 0)
error("setsid: %.100s", strerror(errno));