* 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
This commit is contained in:
parent
b3686317a7
commit
5527d3ae59
@ -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>
|
Fri Feb 21 12:45:50 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* string.c (rb_str_cmp_m): two small bugs fixed.
|
* string.c (rb_str_cmp_m): two small bugs fixed.
|
||||||
|
3
eval.c
3
eval.c
@ -5704,14 +5704,12 @@ rb_f_require(obj, fname)
|
|||||||
return load_dyna(feature, tmp);
|
return load_dyna(feature, tmp);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
load_failed(fname);
|
|
||||||
}
|
}
|
||||||
else if (strcmp(DLEXT, ext) == 0) {
|
else if (strcmp(DLEXT, ext) == 0) {
|
||||||
tmp = rb_find_file(fname);
|
tmp = rb_find_file(fname);
|
||||||
if (tmp) {
|
if (tmp) {
|
||||||
return load_dyna(fname, tmp);
|
return load_dyna(fname, tmp);
|
||||||
}
|
}
|
||||||
load_failed(fname);
|
|
||||||
}
|
}
|
||||||
#ifdef DLEXT2
|
#ifdef DLEXT2
|
||||||
else if (strcmp(DLEXT2, ext) == 0) {
|
else if (strcmp(DLEXT2, ext) == 0) {
|
||||||
@ -5719,7 +5717,6 @@ rb_f_require(obj, fname)
|
|||||||
if (tmp) {
|
if (tmp) {
|
||||||
return load_dyna(fname, tmp);
|
return load_dyna(fname, tmp);
|
||||||
}
|
}
|
||||||
load_failed(fname);
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user