diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gem_prelude.rb | 4 | ||||
| -rw-r--r-- | ruby.c | 4 |
3 files changed, 7 insertions, 6 deletions
@@ -1,4 +1,7 @@ -Mon May 12 10:51:46 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon May 12 10:52:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ruby.c (ruby_init_gems), gem_prelude.rb: check if Gem is defined + instead of Gem::Enable. * gem_prelude.rb (load_full_rubygems_library, const_missing): prevent infinite recursion. [ruby-dev:34539] diff --git a/gem_prelude.rb b/gem_prelude.rb index 8be90510a2..ec9f1f4f33 100644 --- a/gem_prelude.rb +++ b/gem_prelude.rb @@ -2,9 +2,9 @@ # empty gem_prelude.rb # -# p Gem::Enable +# p defined?(Gem) -if defined?(Gem::Enable) && Gem::Enable then +if defined?(Gem) then module Kernel @@ -917,9 +917,7 @@ void Init_prelude(void); static void ruby_init_gems(int enable) { - VALUE gem; - gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), enable ? Qtrue : Qfalse); + if (enable) rb_define_module("Gem"); Init_prelude(); } |