nagachika	2015-03-18 01:59:08 +0900 (Wed, 18 Mar 2015)

  New Revision: 49994

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

  Log:
    merge revision(s) r49490,r49494: [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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/sdbm/_sdbm.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49993)
+++ ruby_2_1/ChangeLog	(revision 49994)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Mar 18 01:58:18 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]
+
 Wed Mar 18 01:45:12 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of
Index: ruby_2_1/ext/sdbm/_sdbm.c
===================================================================
--- ruby_2_1/ext/sdbm/_sdbm.c	(revision 49993)
+++ ruby_2_1/ext/sdbm/_sdbm.c	(revision 49994)
@@ -7,8 +7,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/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>
@@ -803,7 +802,7 @@ delpair(char *pag, datum key) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/sdbm/_sdbm.c#L802
 		}
 #else
 #ifdef MEMMOVE
-		memmove(dst, src, m);
+		memmove(dst-m, src-m, m);
 #else
 		while (m--)
 			*--dst = *--src;
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49993)
+++ ruby_2_1/version.h	(revision 49994)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-03-18"
-#define RUBY_PATCHLEVEL 315
+#define RUBY_PATCHLEVEL 316
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49490,49494


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