From cea3a73f19c2f6124dbf04af6c8160d872d19bfc Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 29 Mar 2013 01:24:14 +0000 Subject: ruby/io.h: get rid of conflict on AIX * 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] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ include/ruby/io.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4a4d390008..e5f6a69929 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 29 10:24:10 2013 Nobuyoshi Nakada + + * 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] + Fri Mar 29 06:39:42 2013 Tanaka Akira * numeric.c (rb_num2ull): Cast double to unsigned LONG_LONG via diff --git a/include/ruby/io.h b/include/ruby/io.h index f341befefe..b5ea2e9c95 100644 --- a/include/ruby/io.h +++ b/include/ruby/io.h @@ -37,6 +37,8 @@ extern "C" { # ifdef _AIX # undef reqevents # undef rtnevents +# undef events +# undef revents # endif # define RB_WAITFD_IN POLLIN # define RB_WAITFD_PRI POLLPRI -- cgit v1.2.3