naruse	2015-02-19 13:35:54 +0900 (Thu, 19 Feb 2015)

  New Revision: 49643

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49643

  Log:
    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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/sdbm/_sdbm.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49642)
+++ ruby_2_2/ChangeLog	(revision 49643)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Feb 19 13:35:21 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* lib/resolv.rb (Resolv::DNS::Resource#==, #hash): elements
Index: ruby_2_2/ext/sdbm/_sdbm.c
===================================================================
--- ruby_2_2/ext/sdbm/_sdbm.c	(revision 49642)
+++ ruby_2_2/ext/sdbm/_sdbm.c	(revision 49643)
@@ -7,8 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/sdbm/_sdbm.c#L7
  * core routines
  */
 
-#include "ruby/config.h"
-#include "ruby/defines.h"
+#include "ruby/ruby.h"
 
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 49642)
+++ ruby_2_2/version.h	(revision 49643)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49490


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/