From 490165e5e39c33b1f99cb0fac5db6765b5b9f38a Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Feb 2015 04:35:54 +0000
Subject: [PATCH] merge revision(s) 49490: [Backport #10825]

	* 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
---
 ChangeLog        | 6 ++++++
 ext/sdbm/_sdbm.c | 3 +--
 version.h        | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eea8c50745..676c0edc20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c
index 847eb2aaf6..b393783ddf 100644
--- a/ext/sdbm/_sdbm.c
+++ b/ext/sdbm/_sdbm.c
@@ -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>
diff --git a/version.h b/version.h
index 0de65f0d44..00419b19c4 100644
--- a/version.h
+++ b/version.h
@@ -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"