From 87ac21590e33e88f498962e62f6a22ffc02dd489 Mon Sep 17 00:00:00 2001 From: odaira Date: Fri, 27 Feb 2015 23:32:48 +0000 Subject: [PATCH] * ext/pty/pty.c: AIX supports autopush. Patch by Perry Smith [ruby-core:58539] [Bug #9144] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/pty/pty.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a792c22585..8f953aaa59 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 28 08:24:30 2015 Rei Odaira + + * ext/pty/pty.c: AIX supports autopush. + Patch by Perry Smith [ruby-core:58539] [Bug #9144] + Fri Feb 27 22:00:05 2015 SHIBATA Hiroshi * lib/rubygems: Update to RubyGems 2.4.6 and HEAD(800f2e6). diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 9260194f35..12555951b5 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -261,7 +261,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if ((slavefd = rb_cloexec_open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error; rb_update_max_fd(slavefd); -#if defined(I_PUSH) && !defined(__linux__) +#if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX) if (ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; if (ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error; if (ioctl(slavefd, I_PUSH, "ttcompat") == -1) goto error; @@ -345,7 +345,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if (no_mesg(slavedevice, nomesg) == -1) goto error; if((slavefd = rb_cloexec_open(slavedevice, O_RDWR, 0)) == -1) goto error; rb_update_max_fd(slavefd); -#if defined(I_PUSH) && !defined(__linux__) +#if defined(I_PUSH) && !defined(__linux__) && !defined(_AIX) if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error; ioctl(slavefd, I_PUSH, "ttcompat");