summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-25 05:33:34 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-02-25 05:33:34 +0000
commit843aadc384db3143638ae7918be6fb5c7a4a47d2 (patch)
tree1b7a6da4a0a81898ade8fd99f11db1264a2244fa /ext
parent5b37cb25ec6c4faeb0296cad1fbe48a9d7c3a56a (diff)
merge revision(s) 49490,49494: [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_0_0@49736 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/sdbm/_sdbm.c5
1 files changed, 2 insertions, 3 deletions
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;