odaira	2015-02-28 08:32:48 +0900 (Sat, 28 Feb 2015)

  New Revision: 49776

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49776

  Log:
    * ext/pty/pty.c: AIX supports autopush. Patch by Perry Smith [ruby-core:58539] [Bug #9144]

  Modified files:
    trunk/ChangeLog
    trunk/ext/pty/pty.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49775)
+++ ChangeLog	(revision 49776)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Feb 28 08:24:30 2015  Rei Odaira  <Rei.Odaira@g...>
+
+	* 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  <shibata.hiroshi@g...>
 
 	* lib/rubygems: Update to RubyGems 2.4.6 and HEAD(800f2e6).
Index: ext/pty/pty.c
===================================================================
--- ext/pty/pty.c	(revision 49775)
+++ ext/pty/pty.c	(revision 49776)
@@ -261,7 +261,7 @@ get_device_once(int *master, int *slave, https://github.com/ruby/ruby/blob/trunk/ext/pty/pty.c#L261
     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, https://github.com/ruby/ruby/blob/trunk/ext/pty/pty.c#L345
     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");

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/