summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-01 00:31:18 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-01 00:31:18 +0000
commitd163179c3e442557537ab6f24357a15af225dc4a (patch)
treed1363a5de07d16e4cc823d5593a70e9198aee11e /variable.c
parent6240b52cb9a8f7bbdab0f9bae6b7979d54f51df5 (diff)
* variable.c (rb_autoloading_value) Fix the order of definitions.
It is used by autoload_defined_p. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
-rw-r--r--variable.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/variable.c b/variable.c
index 3ee4627a2b..9526b6226f 100644
--- a/variable.c
+++ b/variable.c
@@ -1601,18 +1601,6 @@ check_autoload_required(VALUE mod, ID id, const char **loadingpath)
return 0;
}
-static int
-autoload_defined_p(VALUE mod, ID id)
-{
- struct st_table *tbl = RCLASS_CONST_TBL(mod);
- st_data_t val;
-
- if (!tbl || !st_lookup(tbl, (st_data_t)id, &val) || ((rb_const_entry_t*)val)->value != Qundef) {
- return 0;
- }
- return !rb_autoloading_value(mod, id, NULL);
-}
-
int
rb_autoloading_value(VALUE mod, ID id, VALUE* value)
{
@@ -1633,6 +1621,18 @@ rb_autoloading_value(VALUE mod, ID id, VALUE* value)
return 0;
}
+static int
+autoload_defined_p(VALUE mod, ID id)
+{
+ struct st_table *tbl = RCLASS_CONST_TBL(mod);
+ st_data_t val;
+
+ if (!tbl || !st_lookup(tbl, (st_data_t)id, &val) || ((rb_const_entry_t*)val)->value != Qundef) {
+ return 0;
+ }
+ return !rb_autoloading_value(mod, id, NULL);
+}
+
struct autoload_const_set_args {
VALUE mod;
ID id;