diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /openbsd-compat/bsd-openpty.c | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'openbsd-compat/bsd-openpty.c')
-rw-r--r-- | openbsd-compat/bsd-openpty.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c index daf5f8b81..8eb62b7a8 100644 --- a/openbsd-compat/bsd-openpty.c +++ b/openbsd-compat/bsd-openpty.c | |||
@@ -102,7 +102,6 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp, | |||
102 | return (-1); | 102 | return (-1); |
103 | } | 103 | } |
104 | 104 | ||
105 | #ifndef HAVE_CYGWIN | ||
106 | /* | 105 | /* |
107 | * Try to push the appropriate streams modules, as described | 106 | * Try to push the appropriate streams modules, as described |
108 | * in Solaris pts(7). | 107 | * in Solaris pts(7). |
@@ -112,7 +111,6 @@ openpty(int *amaster, int *aslave, char *name, struct termios *termp, | |||
112 | # ifndef __hpux | 111 | # ifndef __hpux |
113 | ioctl(*aslave, I_PUSH, "ttcompat"); | 112 | ioctl(*aslave, I_PUSH, "ttcompat"); |
114 | # endif /* __hpux */ | 113 | # endif /* __hpux */ |
115 | #endif /* HAVE_CYGWIN */ | ||
116 | 114 | ||
117 | return (0); | 115 | return (0); |
118 | 116 | ||