diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-14 15:10:30 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-14 15:10:30 +0000 |
| commit | 5b2ea4e53b79cda97c29ca90467eaa990497d679 (patch) | |
| tree | e9463f31330960ce2f44f7869b05c049821bb997 /include | |
| parent | 303568e6055ce8c5b774f3a06efbb62743d48be0 (diff) | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/io.h | 10 |
1 files changed, 10 insertions, 0 deletions
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 |