summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.guess4
-rw-r--r--eval.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/config.guess b/config.guess
index c2443e3a7f..e29d6abdd1 100644
--- a/config.guess
+++ b/config.guess
@@ -624,11 +624,11 @@ EOF
objdump --private-headers dummy | \
grep ld.so.1 > /dev/null
if test "$?" = 0 ; then
- LIBC="libc1"
+ LIBC="-libc1"
fi
fi
rm -f dummy.s dummy
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+ echo ${UNAME_MACHINE}-unknown-linux${LIBC} ; exit 0
elif test "${UNAME_MACHINE}" = "mips" ; then
cat >dummy.c <<EOF
main(argc, argv)
diff --git a/eval.c b/eval.c
index 65d4f47783..7530b3fbde 100644
--- a/eval.c
+++ b/eval.c
@@ -4509,7 +4509,7 @@ rb_load(fname, wrap)
VALUE *vars = TMP_ALLOC(len);
*vars++ = 0;
MEMCPY(tbl, top_scope->local_tbl, ID, len);
- MEMCPY(vars, top_scope->local_vars, ID, len-1);
+ MEMCPY(vars, top_scope->local_vars, VALUE, len-1);
ruby_scope->local_tbl = tbl; /* copy toplevel scope */
ruby_scope->local_vars = vars; /* will not alter toplevel variables */
}