summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-21 08:25:18 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-02-21 08:25:18 +0000
commit5527d3ae593a9fd666cd4c894fafd6b2ed2a89fe (patch)
tree0a386c91fe04a0985d19a305b67ce8cb35ba9dd8
parentb3686317a774249c4ff4b7514cba880c9adbd9ca (diff)
* eval.c (rb_f_require): do not need to abort if a DLEXT file
is not found. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3522 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a7b4163850..2854196657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 21 17:19:27 2003 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * eval.c (rb_f_require): do not need to abort if a DLEXT file
+ is not found.
+
Fri Feb 21 12:45:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_cmp_m): two small bugs fixed.
diff --git a/eval.c b/eval.c
index ea60f9bcd6..83f9def7cc 100644
--- a/eval.c
+++ b/eval.c
@@ -5704,14 +5704,12 @@ rb_f_require(obj, fname)
return load_dyna(feature, tmp);
}
#endif
- load_failed(fname);
}
else if (strcmp(DLEXT, ext) == 0) {
tmp = rb_find_file(fname);
if (tmp) {
return load_dyna(fname, tmp);
}
- load_failed(fname);
}
#ifdef DLEXT2
else if (strcmp(DLEXT2, ext) == 0) {
@@ -5719,7 +5717,6 @@ rb_f_require(obj, fname)
if (tmp) {
return load_dyna(fname, tmp);
}
- load_failed(fname);
}
#endif
}