summaryrefslogtreecommitdiff
path: root/ruby.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-15 00:48:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-01-15 00:48:16 +0000
commit7350562e5ea1246032f88cf008b8f0434e375da5 (patch)
tree3ed859bd2cace377389b467096dd256d2d36cc6e /ruby.c
parentfea355647eb8420d26d961b8a2ab1540fba0ec79 (diff)
* ruby.c (ruby_init_prelude): get rid of global namespace
pullution. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30547 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ruby.c')
-rw-r--r--ruby.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ruby.c b/ruby.c
index 079afd8d34..61a293e57e 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1103,9 +1103,8 @@ proc_options(long argc, char **argv, struct cmdline_options *opt, int envopt)
void Init_prelude(void);
static void
-ruby_init_prelude(int enable_gems)
+ruby_init_prelude(void)
{
- rb_gv_set("$disable_rubygems", enable_gems ? Qfalse : Qtrue);
Init_prelude();
rb_const_remove(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
}
@@ -1365,7 +1364,10 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
rb_enc_associate(RARRAY_PTR(load_path)[i], lenc);
}
}
- ruby_init_prelude(!(opt->disable & DISABLE_BIT(gems)));
+ if (!(opt->disable & DISABLE_BIT(gems))) {
+ rb_define_module("Gem");
+ }
+ ruby_init_prelude();
ruby_set_argv(argc, argv);
process_sflag(&opt->sflag);