kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 39987,39993,39998: [Backport #8174]

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]

	* 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
This commit is contained in:
nagachika 2013-04-14 15:10:30 +00:00
parent 303568e605
commit 5b2ea4e53b
3 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Mon Apr 15 00:07:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/io.h: undef POSIX compliant names on AIX, which are no
longer needed. patch suggested by edelsohn (David Edelsohn) in
[ruby-core:53815]. [Bug #8174]
Mon Apr 15 00:07:31 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/io.h: rename SVR3,4 member names as POSIX compliant,
to get rid of conflict on AIX. [ruby-core:53765] [Bug #8174]
Sun Apr 14 23:49:48 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (configuration): not include all CFLAGS in CXXFLAGS, to

10
include/ruby/io.h
View file

@ -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

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-04-14"
#define RUBY_PATCHLEVEL 127
#define RUBY_RELEASE_DATE "2013-04-15"
#define RUBY_PATCHLEVEL 128
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 14
#define RUBY_RELEASE_DAY 15
#include "ruby/version.h"