nagachika	2013-04-15 00:10:30 +0900 (Mon, 15 Apr 2013)

  New Revision: 40292

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

  Log:
    merge revision(s) 39987,39993,39998: [Backport #8174]
    
    * include/ruby/io.h: rename SVR3,4 member names as POSIX compliants,
      to get rid of conflict on AIX.  [ruby-core:53765] [Bug #8174]
    
    * include/ruby/io.h: undef POSIX compliants names on AIX, which are no
      longer needed.  patch suggested by edelsohn (David Edelsohn) in
      [ruby-core:53815].  [Bug #8174]
    
    * include/ruby/io.h: undef POSIX compliant names on AIX, which are no
    
    * include/ruby/io.h: rename SVR3,4 member names as POSIX compliant,

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/include/ruby/io.h
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/include/ruby/io.h
===================================================================
--- ruby_2_0_0/include/ruby/io.h	(revision 40291)
+++ ruby_2_0_0/include/ruby/io.h	(revision 40292)
@@ -29,7 +29,17 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/include/ruby/io.h#L29
 
 #include "ruby/config.h"
 #if defined(HAVE_POLL)
+#  ifdef _AIX
+#    define reqevents events
+#    define rtnevents revents
+#  endif
 #  include <poll.h>
+#  ifdef _AIX
+#    undef reqevents
+#    undef rtnevents
+#    undef events
+#    undef revents
+#  endif
 #  define RB_WAITFD_IN  POLLIN
 #  define RB_WAITFD_PRI POLLPRI
 #  define RB_WAITFD_OUT POLLOUT
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 40291)
+++ ruby_2_0_0/ChangeLog	(revision 40292)
@@ -1,3 +1,14 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Apr 15 00:07:31 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/io.h: undef POSIX compliant names on AIX, which are no
+	  longer needed.  patch suggested by edelsohn (David Edelsohn) in
+	  [ruby-core:53815].  [Bug #8174]
+
+Mon Apr 15 00:07:31 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/io.h: rename SVR3,4 member names as POSIX compliant,
+	  to get rid of conflict on AIX.  [ruby-core:53765] [Bug #8174]
+
 Sun Apr 14 23:49:48 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 40291)
+++ ruby_2_0_0/version.h	(revision 40292)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-04-14"
-#define RUBY_PATCHLEVEL 127
+#define RUBY_RELEASE_DATE "2013-04-15"
+#define RUBY_PATCHLEVEL 128
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 14
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39987,39993,39998


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