usa	2015-05-21 09:47:11 +0900 (Thu, 21 May 2015)

  New Revision: 50570

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

  Log:
    merge revision(s) 49776: [Backport #9144]
    
    * ext/pty/pty.c: AIX supports autopush.
      Patch by Perry Smith [ruby-core:58539] [Bug #9144]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/pty/pty.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50569)
+++ ruby_2_1/ChangeLog	(revision 50570)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu May 21 09:46:58 2015  Rei Odaira  <Rei.Odaira@g...>
+
+	* ext/pty/pty.c: AIX supports autopush.
+	  Patch by Perry Smith [ruby-core:58539] [Bug #9144]
+
 Wed May 20 17:34:43 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* iseq.c (rb_iseq_compile_with_option): check source type, must be
Index: ruby_2_1/ext/pty/pty.c
===================================================================
--- ruby_2_1/ext/pty/pty.c	(revision 50569)
+++ ruby_2_1/ext/pty/pty.c	(revision 50570)
@@ -262,7 +262,7 @@ get_device_once(int *master, int *slave, https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/pty/pty.c#L262
     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;
@@ -346,7 +346,7 @@ get_device_once(int *master, int *slave, https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/pty/pty.c#L346
     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");
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50569)
+++ ruby_2_1/version.h	(revision 50570)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.7"
-#define RUBY_RELEASE_DATE "2015-05-20"
-#define RUBY_PATCHLEVEL 345
+#define RUBY_RELEASE_DATE "2015-05-21"
+#define RUBY_PATCHLEVEL 346
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 21
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49776


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