summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--config.guess4
-rw-r--r--eval.c1
-rw-r--r--regex.c4
4 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index daa0d674f2..b4f8f63328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Oct 2 18:31:20 2001 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (rb_eval): should override existing class.
+
Mon Oct 1 19:18:54 2001 Tanaka Akira <akr@m17n.org>
* ext/socket/socket.c (unix_addr): getsockname(2) may result len = 0.
diff --git a/config.guess b/config.guess
index 990aa5293a..acf6a089e5 100644
--- a/config.guess
+++ b/config.guess
@@ -870,11 +870,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-${LIBC}
+ echo ${UNAME_MACHINE}-unknown-linux${LIBC}
exit 0 ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
diff --git a/eval.c b/eval.c
index 8ef72db5bb..b8b9077b51 100644
--- a/eval.c
+++ b/eval.c
@@ -3082,7 +3082,6 @@ rb_eval(self, n)
tmp = RCLASS(tmp)->super;
}
if (tmp != super) {
- super = tmp;
goto override_class;
}
}
diff --git a/regex.c b/regex.c
index 1be2c2f890..340e96e46e 100644
--- a/regex.c
+++ b/regex.c
@@ -3415,7 +3415,7 @@ re_search(bufp, string, size, startpos, range, regs)
\
*stackp++ = pattern_place; \
*stackp++ = string_place; \
- *stackp++ = (unsigned char*)options; /* current option status */ \
+ *stackp++ = (unsigned char*)(long)options; /* current option status */ \
*stackp++ = (unsigned char*)0; /* non-greedy flag */ \
} while(0)
@@ -4296,7 +4296,7 @@ re_match(bufp, string_arg, size, pos, regs)
goto fail;
}
stackp--; /* discard greedy flag */
- options = (int)*--stackp;
+ options = (long)*--stackp;
d = *--stackp;
p = *--stackp;
/* Restore register info. */