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,


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 24 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 714c502aa8..57b35d75d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Apr 15 00:07:31 2013  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* 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@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to
diff --git a/include/ruby/io.h b/include/ruby/io.h
index 07be55c46c..b5ea2e9c95 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -29,7 +29,17 @@ extern "C" {
 
 #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
diff --git a/version.h b/version.h
index 0633503f46..fe6d111ce6 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #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"