* eval.c (top_include): include in the wrapped load is done for

  the wrapper, not for a singleton class for wrapped main.
  [ruby-dev:23305]

* bignum.c (rb_big_eq): use temporary double variable to save the
  result (internal float register may be bigger than 64 bits, for
  example, 80 bits on x86).  [ruby-dev:23311]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 5 deletions

diff --git a/eval.c b/eval.c
index 25a15b3c3..a66f710a8 100644
--- a/eval.c
+++ b/eval.c
@@ -7222,12 +7222,10 @@ top_include(argc, argv, self)
 {
     rb_secure(4);
     if (ruby_wrapper) {
-	rb_warn("main#include in the wrapped load is effective only for toplevel");
-	return rb_obj_extend(argc, argv, self);
-    }
-    else {
-	return rb_mod_include(argc, argv, rb_cObject);
+	rb_warning("main#include in the wrapped load is effective only in wrapper module");
+	return rb_mod_include(argc, argv, ruby_wrapper);
     }
+    return rb_mod_include(argc, argv, rb_cObject);
 }
 
 VALUE rb_f_trace_var();