diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-17 16:59:08 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-17 16:59:08 +0000 |
| commit | 838f246282511b4b64b70d1427716edcc739da0d (patch) | |
| tree | 31fe64299a1652ecbec3c15a6c11a86423c98605 /ext | |
| parent | 8aca3e79eeafd71f524bbd2b5aef1ac8feab35b1 (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/sdbm/_sdbm.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/sdbm/_sdbm.c b/ext/sdbm/_sdbm.c index 847eb2aaf6..d810befbce 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; |