diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-05 13:33:59 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-05 13:33:59 +0000 |
| commit | 0f0c5653a3faedf2c39d0ca7ae6d93619898524f (patch) | |
| tree | e29dc32b54211e94692192b9ed7296d464a99290 /include | |
| parent | 2ebd4baec095be6de78a490992c887b041be2c8f (diff) | |
merges r20531 from trunk into ruby_1_9_1.
* load.c (rb_get_load_path): returns the load path without
touching.
* load.c (rb_feature_provided): new function to return the loading
path in addition to rb_provided().
* load.c (search_required): sets path if loading.
* variable.c (autoload_provided): load paths are expanded to check
if loading.
* variable.c (autoload_node): keeps autoload mark while loading.
[ruby-core:20235]
* variable.c (rb_const_get_0): loops while autoload mark is set.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
| -rw-r--r-- | include/ruby/intern.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/ruby/intern.h b/include/ruby/intern.h index a2d4fcb91a..25ca518f8b 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -267,6 +267,7 @@ void rb_load(VALUE, int); void rb_load_protect(VALUE, int, int*); NORETURN(void rb_jump_tag(int)); int rb_provided(const char*); +int rb_feature_provided(const char *, const char **); void rb_provide(const char*); VALUE rb_f_require(VALUE, VALUE); VALUE rb_require_safe(VALUE, int); |