- (bal) [configure.ac defines.h loginrec.c sshd.c sshpty.c] Partial sync

[openssh.git] / sshpty.c

diff --git a/sshpty.c b/sshpty.c
index 64ac4e5994fa8d636431b88d043c561217c9030f..e3027ca2ec50acb5deb3d2a3c0dfbd4d782a8f87 100644 (file)
--- 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));