1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby/io.h: get rid of conflict on AIX

Browse Source 
* 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
This commit is contained in:
nobu 2013-03-28 14:10:21 +00:00
parent f25e55cb87
commit 05f5cbeb75
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Mar 28 23:10:10 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@fsij.org> Thu Mar 28 18:22:21 2013 Tanaka Akira <akr@fsij.org>
* test/-ext-/num2int/test_num2int.rb: extract * test/-ext-/num2int/test_num2int.rb: extract

8
include/ruby/io.h
View File

@ -29,7 +29,15 @@ extern "C" {
#include "ruby/config.h" #include "ruby/config.h"
#if defined(HAVE_POLL) #if defined(HAVE_POLL)
# ifdef _AIX
# define reqevents events
# define rtnevents revents
# endif
# include <poll.h> # include <poll.h>
# ifdef _AIX
# undef reqevents
# undef rtnevents
# endif
# define RB_WAITFD_IN POLLIN # define RB_WAITFD_IN POLLIN
# define RB_WAITFD_PRI POLLPRI # define RB_WAITFD_PRI POLLPRI
# define RB_WAITFD_OUT POLLOUT # define RB_WAITFD_OUT POLLOUT