diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2000-06-27 08:42:27 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2000-06-27 08:42:27 +0000 |
| commit | dcd94d3786f6eadfcf7cf9c79e2886e931b0f296 (patch) | |
| tree | a84f5b81e2b12e79ff3026338156c8c17f237609 | |
| parent | 756a2aba9c94fdd7976bf30d0420e5565be7a190 (diff) | |
| download | zsh-dcd94d3786f6eadfcf7cf9c79e2886e931b0f296.tar.gz zsh-dcd94d3786f6eadfcf7cf9c79e2886e931b0f296.tar.xz zsh-dcd94d3786f6eadfcf7cf9c79e2886e931b0f296.zip | |
Andrej: 12081: zpty under cygwin
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/Modules/zpty.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 90b1767e0..6fb3efc57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-06-27 Peter Stephenson <pws@cambridgesiliconradio.com> + + * Andrej: 12081: Src/Modules/zpty.c: compiles under Cygwin, but + still glitches. + 2000-06-26 Peter Stephenson <pws@pwstephenson.fsnet.co.uk> * unposted: Src/builtin.c, Src/utils.c: move read_poll to utils.c diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c index dd15a1d2d..d47beedeb 100644 --- a/Src/Modules/zpty.c +++ b/Src/Modules/zpty.c @@ -155,9 +155,11 @@ getptycmd(char *name) /**** maybe we should use configure here */ /**** and we certainly need more/better #if tests */ -#if defined(__SVR4) || defined(sinix) +#if defined(__SVR4) || defined(sinix) || defined(__CYGWIN__) +#if !defined(__CYGWIN__) #include <sys/stropts.h> +#endif static int get_pty(int master, int *retfd) @@ -183,6 +185,7 @@ get_pty(int master, int *retfd) close(mfd); return 1; } +#if !defined(__CYGWIN__) if ((ret = ioctl(sfd, I_FIND, "ptem")) != 1) if (ret == -1 || ioctl(sfd, I_PUSH, "ptem") == -1) { close(mfd); @@ -201,13 +204,14 @@ get_pty(int master, int *retfd) close(sfd); return 1; } +#endif /* !defined(__CYGWIN__) */ *retfd = sfd; return 0; } -#else /* ! (defined(__SVR4) || defined(sinix)) */ +#else /* ! (defined(__SVR4) || defined(sinix) || defined(__CYGWIN__)) */ static int get_pty(int master, int *retfd) |