diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/sdbm/_sdbm.c | 5 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Wed Feb 25 14:29:19 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] + Wed Feb 25 14:22:57 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/mkmf.rb (try_cppflags, try_cflags, try_ldflags): get rid of diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c index 874239a276..cb09bac589 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> @@ -803,7 +802,7 @@ delpair(char *pag, datum key) } #else #ifdef MEMMOVE - memmove(dst, src, m); + memmove(dst-m, src-m, m); #else while (m--) *--dst = *--src; @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2015-02-25" -#define RUBY_PATCHLEVEL 638 +#define RUBY_PATCHLEVEL 639 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 |