archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 49490: [Backport #10825]

Browse source 
* ext/sdbm/_sdbm.c: include ruby/ruby.h for PRIdPTRDIFF when a
	  macro `DEBUG` is defined.  based on the patch by Owen Rodley in
	  [ruby-core:67987]. [Bug #10825]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@49643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2015-02-19 04:35:54 +00:00
parent 64e6d2bd8f
commit 490165e5e3
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Thu Feb 19 13:35:21 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/sdbm/_sdbm.c: include ruby/ruby.h for PRIdPTRDIFF when a
macro `DEBUG` is defined. based on the patch by Owen Rodley in
[ruby-core:67987]. [Bug #10825]
Tue Feb 17 18:57:13 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements

3
ext/sdbm/_sdbm.c
View file

@ -7,8 +7,7 @@
* core routines
*/
#include "ruby/config.h"
#include "ruby/defines.h"
#include "ruby/ruby.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.0"
#define RUBY_RELEASE_DATE "2015-02-18"
#define RUBY_PATCHLEVEL 53
#define RUBY_RELEASE_DATE "2015-02-19"
#define RUBY_PATCHLEVEL 54
#define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 18
#define RUBY_RELEASE_DAY 19
#include "ruby/version.h"