Import of OpenSSH 4.9p1

[gssapi-openssh.git] / openssh / openbsd-compat / bsd-openpty.c

diff --git a/openssh/openbsd-compat/bsd-openpty.c b/openssh/openbsd-compat/bsd-openpty.c
index daf5f8b811f30edd9aded9cd27dac30fc7cd1baa..9777eb556d2d80c96bd2b51bf18fc9551679aa08 100644 (file)
--- a/openssh/openbsd-compat/bsd-openpty.c
+++ b/openssh/openbsd-compat/bsd-openpty.c
@@ -35,6 +35,21 @@
 #include "includes.h"
 #if !defined(HAVE_OPENPTY)
 
+#include <sys/types.h>
+
+#include <stdlib.h>
+
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+# include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
+#endif
+
 #ifdef HAVE_UTIL_H
 # include <util.h>
 #endif /* HAVE_UTIL_H */
@@ -46,6 +61,10 @@
 # include <sys/stropts.h>
 #endif
 
+#include <signal.h>
+#include <string.h>
+#include <unistd.h>
+
 #ifndef O_NOCTTY
 #define O_NOCTTY 0
 #endif
@@ -102,7 +121,6 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp,
                return (-1);
        }
 
-#ifndef HAVE_CYGWIN
        /*
         * Try to push the appropriate streams modules, as described 
         * in Solaris pts(7).
@@ -112,7 +130,6 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp,
 # ifndef __hpux
        ioctl(*aslave, I_PUSH, "ttcompat");
 # endif /* __hpux */
-#endif /* HAVE_CYGWIN */
 
        return (0);