summaryrefslogtreecommitdiff
path: root/include/ruby
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-28 14:10:21 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-03-28 14:10:21 +0000
commit05f5cbeb7588fca122e92d9e9fe8a9d1e07e3abc (patch)
tree48ddf6b12f81d660397ae540de893c60d043a450 /include/ruby
parentf25e55cb875b64a84c2e1f9e24722b129ba07ce0 (diff)
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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby')
-rw-r--r--include/ruby/io.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/ruby/io.h b/include/ruby/io.h
index 07be55c46c..f341befefe 100644
--- a/include/ruby/io.h
+++ b/include/ruby/io.h
@@ -29,7 +29,15 @@ 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
+# endif
# define RB_WAITFD_IN POLLIN
# define RB_WAITFD_PRI POLLPRI
# define RB_WAITFD_OUT POLLOUT