nobu	2013-03-28 23:10:21 +0900 (Thu, 28 Mar 2013)

  New Revision: 39987

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

  Log:
    ruby/io.h: get rid of conflict on AIX
    
    * include/ruby/io.h: rename SVR3,4 member names as POSIX compliants,
      to get rid of conflict on AIX.  [ruby-core:53765] [Bug #8174]

  Modified files:
    trunk/ChangeLog
    trunk/include/ruby/io.h

Index: include/ruby/io.h
===================================================================
--- include/ruby/io.h	(revision 39986)
+++ include/ruby/io.h	(revision 39987)
@@ -29,7 +29,15 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/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
+#  endif
 #  define RB_WAITFD_IN  POLLIN
 #  define RB_WAITFD_PRI POLLPRI
 #  define RB_WAITFD_OUT POLLOUT
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39986)
+++ ChangeLog	(revision 39987)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Mar 28 23:10:10 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/io.h: rename SVR3,4 member names as POSIX compliants,
+	  to get rid of conflict on AIX.  [ruby-core:53765] [Bug #8174]
+
 Thu Mar 28 18:22:21 2013  Tanaka Akira  <akr@f...>
 
 	* test/-ext-/num2int/test_num2int.rb: extract

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