* lib/mathn.rb (Rational::power2): typo fixed. [ruby-core:17293]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

11 files changed, 292 insertions, 128 deletions

diff --git a/ChangeLog b/ChangeLog
index 0a537b4259..dfd2efc215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Jun 20 02:16:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/mathn.rb (Rational::power2): typo fixed.  [ruby-core:17293]
+
 Thu Jun 19 21:38:08 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/extmk.rb (extmake): check if compile before showing message.
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index 3cc30ae2e8..a4bc661eb1 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -46,11 +46,7 @@ extern "C" {
 
 #if defined(_WIN32)
 #  define OSSL_NO_CONF_API 1
-#  ifdef USE_WINSOCK2
-#    include <winsock2.h>
-#  else
-#    include <winsock.h>
-#  endif
+#  include <winsock2.h>
 #endif
 #include <errno.h>
 #include <openssl/err.h>
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 7838c51aa2..9fade90742 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -269,8 +269,6 @@ strio_init(argc, argv, ptr)
 	break;
     }
     ptr->string = string;
-    ptr->pos = 0;
-    ptr->lineno = 0;
 }
 
 static VALUE
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 7762b2a060..4807ea7b40 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -2,17 +2,10 @@
 
 require 'mkmf'
 
+#is_win32 = (/mswin32|mingw|cygwin|bccwin32/ =~ RUBY_PLATFORM)
 is_win32 = (/mswin|mingw|cygwin|bccwin|wince/ =~ RUBY_PLATFORM)
 #is_macosx = (/darwin/ =~ RUBY_PLATFORM)
 
-have_header("ruby/ruby.h")
-have_header("ruby/encoding.h")
-have_func("ruby_native_thread_p", "ruby.h")
-have_func("rb_errinfo", "ruby.h")
-have_func("rb_safe_level", "ruby.h")
-have_struct_member("struct RArray", "ptr", "ruby.h")
-have_struct_member("struct RArray", "len", "ruby.h")
-
 def find_framework(tcl_hdr, tk_hdr)
   if framework_dir = with_config("tcltk-framework")
     paths = [framework_dir]
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
index a12d487561..6d3b330f0e 100644
--- a/ext/tk/stubs.c
+++ b/ext/tk/stubs.c
@@ -92,7 +92,7 @@ static DL_HANDLE tcl_dll = (DL_HANDLE)0;
 static DL_HANDLE tk_dll  = (DL_HANDLE)0;
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_open_tcl_dll(char *appname)
 #else
 ruby_open_tcl_dll(appname)
@@ -179,7 +179,7 @@ ruby_open_tk_dll()
 }
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_open_tcltk_dll(char *appname)
 #else
 ruby_open_tcltk_dll(appname)
@@ -203,7 +203,7 @@ tk_stubs_init_p()
 
 
 Tcl_Interp *
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tcl_create_ip_and_stubs_init(int *st)
 #else
 ruby_tcl_create_ip_and_stubs_init(st)
@@ -290,7 +290,7 @@ ruby_tcl_stubs_init()
 }
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
 #else
 ruby_tk_stubs_init(tcl_ip)
@@ -330,7 +330,7 @@ ruby_tk_stubs_init(tcl_ip)
 }
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
 #else
 ruby_tk_stubs_safeinit(tcl_ip)
@@ -421,7 +421,7 @@ static int open_tcl_dll = 0;
 static int call_tk_stubs_init = 0;
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_open_tcl_dll(char *appname)
 #else
 ruby_open_tcl_dll(appname)
@@ -450,7 +450,7 @@ ruby_open_tk_dll()
 }
 
 int 
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_open_tcltk_dll(char *appname)
 #else
 ruby_open_tcltk_dll(appname)
@@ -473,7 +473,7 @@ tk_stubs_init_p()
 }
 
 Tcl_Interp *
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tcl_create_ip_and_stubs_init(int *st)
 #else
 ruby_tcl_create_ip_and_stubs_init(st)
@@ -506,7 +506,7 @@ ruby_tcl_stubs_init()
 }
 
 int 
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
 #else
 ruby_tk_stubs_init(tcl_ip)
@@ -527,7 +527,7 @@ ruby_tk_stubs_init(tcl_ip)
 }
 
 int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
 #else
 ruby_tk_stubs_safeinit(tcl_ip)
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index ea892f62b3..df4a2ea18f 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -8,12 +8,10 @@
 
 #include "ruby.h"
 
-#ifdef HAVE_RUBY_RUBY_H
+#ifdef RUBY_VM
 /* #include "ruby/ruby.h" */
 #include "ruby/signal.h"
-#ifdef HAVE_RUBY_ENCODING_H
 #include "ruby/encoding.h"
-#endif
 #else
 /* #include "ruby.h" */
 #include "rubysig.h"
@@ -33,19 +31,6 @@
 #include <tcl.h>
 #include <tk.h>
 
-#ifndef HAVE_RUBY_NATIVE_THREAD_P
-#define ruby_native_thread_p() is_ruby_native_thread()
-#undef RUBY_USE_NATIVE_THREAD
-#else
-#define RUBY_USE_NATIVE_THREAD 1
-#endif
-#ifndef HAVE_RB_ERRINFO
-#define rb_errinfo() (ruby_errinfo+0) /* cannot be l-value */
-#endif
-#ifndef HAVE_RB_SAFE_LEVEL
-#define rb_safe_level() (ruby_safe_level+0) /* cannot be l-value */
-#endif
-
 #include "stubs.h"
 
 #ifndef TCL_ALPHA_RELEASE
@@ -125,7 +110,7 @@ static void ip_finalize _((Tcl_Interp*));
 
 static int at_exit = 0;
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 static VALUE cRubyEncoding;
 
 /* encoding */
@@ -210,7 +195,7 @@ static Tcl_ObjType *Tcl_ObjType_String;
 
 /* safe Tcl_Eval and Tcl_GlobalEval */
 static int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 tcl_eval(Tcl_Interp *interp, const char *cmd)
 #else
 tcl_eval(interp, cmd)
@@ -231,7 +216,7 @@ tcl_eval(interp, cmd)
 #define Tcl_Eval tcl_eval
 
 static int
-#ifdef HAVE_PROTOTYPES
+#ifdef RUBY_VM
 tcl_global_eval(Tcl_Interp *interp, const char *cmd)
 #else
 tcl_global_eval(interp, cmd)
@@ -408,7 +393,7 @@ call_queue_mark(struct call_queue *q)
 
 
 static VALUE eventloop_thread;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 Tcl_ThreadId tk_eventloop_thread_id;  /* native thread ID of Tcl interpreter */
 #endif
 static VALUE eventloop_stack;
@@ -439,14 +424,14 @@ static int have_rb_thread_waiting_for_value = 0;
  *  'timer_tick' is a limit of one term of thread scheduling. 
  *  If 'timer_tick' == 0, then not use the timer for thread scheduling.
  */
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 #define DEFAULT_EVENT_LOOP_MAX        800/*counts*/
 #define DEFAULT_NO_EVENT_TICK          10/*counts*/
 #define DEFAULT_NO_EVENT_WAIT          10/*milliseconds ( 1 -- 999 ) */
 #define WATCHDOG_INTERVAL              10/*milliseconds ( 1 -- 999 ) */
 #define DEFAULT_TIMER_TICK              0/*milliseconds ( 0 -- 999 ) */
 #define NO_THREAD_INTERRUPT_TIME      100/*milliseconds ( 1 -- 999 ) */
-#else /* ! RUBY_USE_NATIVE_THREAD */
+#else /* ! RUBY_VM */
 #define DEFAULT_EVENT_LOOP_MAX        800/*counts*/
 #define DEFAULT_NO_EVENT_TICK          10/*counts*/
 #define DEFAULT_NO_EVENT_WAIT          20/*milliseconds ( 1 -- 999 ) */
@@ -688,7 +673,7 @@ struct tcltkip {
 #if TCL_NAMESPACE_DEBUG
     Tcl_Namespace *default_ns;   /* default namespace */
 #endif
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     Tcl_ThreadId tk_thread_id;   /* native thread ID of Tcl interpreter */
 #endif
     int has_orig_exit;           /* has original 'exit' command ? */
@@ -881,7 +866,7 @@ tcltkip_init_tk(interp)
     }
 #endif
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     ptr->tk_thread_id = Tcl_GetCurrentThread();
 #endif
 
@@ -1153,7 +1138,7 @@ _timer_for_tcl(clientData)
     /* tick_counter += event_loop_max; */
 }
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 #if USE_TOGGLE_WINDOW_MODE_FOR_IDLE
 static int
 toggle_eventloop_window_mode_for_idle()
@@ -1496,7 +1481,7 @@ static VALUE
 lib_num_of_mainwindows(self)
     VALUE self;
 {
-#ifdef RUBY_USE_NATIVE_THREAD  /* Ruby 1.9+ !!! */
+#ifdef RUBY_VM  /* Ruby 1.9+ !!! */
     return tk_funcall(lib_num_of_mainwindows_core, 0, (VALUE*)NULL, self);
 #else
     return lib_num_of_mainwindows_core(self, 0, (VALUE*)NULL);
@@ -1504,7 +1489,7 @@ lib_num_of_mainwindows(self)
 }
 
 
-#ifdef RUBY_USE_NATIVE_THREAD  /* Ruby 1.9+ !!! */
+#ifdef RUBY_VM  /* Ruby 1.9+ !!! */
 static VALUE
 call_DoOneEvent_core(flag_val)
     VALUE flag_val;
@@ -1553,11 +1538,17 @@ eventloop_sleep(dummy)
     t.tv_usec = (time_t)(no_event_wait*1000.0);
 
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on eventloop_sleep()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on eventloop_sleep()");
+    }
+#endif
 #endif
 
     DUMP2("eventloop_sleep: rb_thread_wait_for() at thread : %lx", rb_thread_current());
@@ -1565,11 +1556,17 @@ eventloop_sleep(dummy)
     DUMP2("eventloop_sleep: finish at thread : %lx", rb_thread_current());
 
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on eventloop_sleep()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on eventloop_sleep()");
+    }
+#endif
 #endif
 
     return Qnil;
@@ -1581,7 +1578,7 @@ eventloop_sleep(dummy)
 static int
 get_thread_alone_check_flag()
 {
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
   return 0;
 #else
   set_tcltk_version();
@@ -1693,11 +1690,19 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
             if (status) {
                 switch (status) {
                 case TAG_RAISE:
+#ifdef RUBY_VM
                     if (NIL_P(rb_errinfo())) {
+#else
+                    if (NIL_P(ruby_errinfo)) {
+#endif
                         rbtk_pending_exception 
                             = rb_exc_new2(rb_eException, "unknown exception");
                     } else {
+#ifdef RUBY_VM
                         rbtk_pending_exception = rb_errinfo();
+#else
+                        rbtk_pending_exception = ruby_errinfo;
+#endif
 
                         if (!NIL_P(rbtk_pending_exception)) {
                             if (rbtk_eventloop_depth == 0) {
@@ -1712,10 +1717,18 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                     break;
 
                 case TAG_FATAL:
+#ifdef RUBY_VM
                     if (NIL_P(rb_errinfo())) {
+#else
+                    if (NIL_P(ruby_errinfo)) {
+#endif
                         rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
                     } else {
+#ifdef RUBY_VM
                         rb_exc_raise(rb_errinfo());
+#else
+                        rb_exc_raise(ruby_errinfo);
+#endif
                     }
                 }
             }
@@ -1806,7 +1819,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                 if (NIL_P(eventloop_thread) || current == eventloop_thread) {
                     int st;
                     int status;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 		    if (update_flag) {
 		      st = RTEST(rb_protect(call_DoOneEvent, 
 					    INT2FIX(event_flag), &status)); 
@@ -1842,12 +1855,20 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                     if (status) {
                         switch (status) {
                         case TAG_RAISE:
+#ifdef RUBY_VM
                             if (NIL_P(rb_errinfo())) {
+#else
+                            if (NIL_P(ruby_errinfo)) {
+#endif
                                 rbtk_pending_exception 
                                     = rb_exc_new2(rb_eException, 
                                                   "unknown exception");
                             } else {
+#ifdef RUBY_VM
                                 rbtk_pending_exception = rb_errinfo();
+#else
+                                rbtk_pending_exception = ruby_errinfo;
+#endif
 
                                 if (!NIL_P(rbtk_pending_exception)) {
                                     if (rbtk_eventloop_depth == 0) {
@@ -1862,10 +1883,18 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                             break;
 
                         case TAG_FATAL:
+#ifdef RUBY_VM
                             if (NIL_P(rb_errinfo())) {
+#else
+                            if (NIL_P(ruby_errinfo)) {
+#endif
                                 rb_exc_raise(rb_exc_new2(rb_eFatal, "FATAL"));
                             } else {
+#ifdef RUBY_VM
                                 rb_exc_raise(rb_errinfo());
+#else
+                                rb_exc_raise(ruby_errinfo);
+#endif
                             }
                         }
                     }
@@ -1915,12 +1944,20 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                         if (status) {
                             switch (status) {
                             case TAG_RAISE:
+#ifdef RUBY_VM
                                 if (NIL_P(rb_errinfo())) {
+#else
+                                if (NIL_P(ruby_errinfo)) {
+#endif
                                     rbtk_pending_exception 
                                         = rb_exc_new2(rb_eException, 
                                                       "unknown exception");
                                 } else {
+#ifdef RUBY_VM
                                     rbtk_pending_exception = rb_errinfo();
+#else
+                                    rbtk_pending_exception = ruby_errinfo;
+#endif
 
                                     if (!NIL_P(rbtk_pending_exception)) {
                                         if (rbtk_eventloop_depth == 0) {
@@ -1935,11 +1972,19 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
                                 break;
 
                             case TAG_FATAL:
+#ifdef RUBY_VM
                                 if (NIL_P(rb_errinfo())) {
+#else
+                                if (NIL_P(ruby_errinfo)) {
+#endif
                                     rb_exc_raise(rb_exc_new2(rb_eFatal, 
                                                              "FATAL"));
                                 } else {
+#ifdef RUBY_VM
                                     rb_exc_raise(rb_errinfo());
+#else
+                                    rb_exc_raise(ruby_errinfo);
+#endif
                                 }
                             }
                         }
@@ -2000,7 +2045,7 @@ lib_eventloop_core(check_root, update_flag, check_var, interp)
         }
 
         DUMP1("trap check & thread scheduling");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
         /* if (update_flag == 0) CHECK_INTS; */ /*XXXXXXXXXXXXX  TODO !!!! */
 #else
         if (update_flag == 0) CHECK_INTS;
@@ -2051,19 +2096,35 @@ lib_eventloop_main(args)
 
     switch (status) {
     case TAG_RAISE:
+#ifdef RUBY_VM
         if (NIL_P(rb_errinfo())) {
+#else
+        if (NIL_P(ruby_errinfo)) {
+#endif
             rbtk_pending_exception 
                 = rb_exc_new2(rb_eException, "unknown exception");
         } else {
+#ifdef RUBY_VM
             rbtk_pending_exception = rb_errinfo();
+#else
+            rbtk_pending_exception = ruby_errinfo;
+#endif
         }
         return Qnil;
 
     case TAG_FATAL:
+#ifdef RUBY_VM
         if (NIL_P(rb_errinfo())) {
+#else
+        if (NIL_P(ruby_errinfo)) {
+#endif
             rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
         } else {
+#ifdef RUBY_VM
             rbtk_pending_exception = rb_errinfo();
+#else
+            rbtk_pending_exception = ruby_errinfo;
+#endif
         }
         return Qnil;
     }
@@ -2118,7 +2179,7 @@ lib_eventloop_ensure(args)
         }
     }
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (NIL_P(eventloop_thread)) {
         tk_eventloop_thread_id = (Tcl_ThreadId) 0;
     }
@@ -2147,7 +2208,7 @@ lib_eventloop_launcher(check_root, update_flag, check_var, interp)
     tcl_stubs_check();
 
     eventloop_thread = rb_thread_current();
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     tk_eventloop_thread_id = Tcl_GetCurrentThread();
 #endif
 
@@ -2300,7 +2361,7 @@ lib_watchdog_ensure(arg)
     VALUE arg;
 {
     eventloop_thread = Qnil; /* stop eventloops */
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     tk_eventloop_thread_id = (Tcl_ThreadId) 0;
 #endif
     return Qnil;
@@ -2314,7 +2375,7 @@ lib_mainloop_watchdog(argc, argv, self)
 {
     VALUE check_rootwidget;
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     rb_raise(rb_eNotImpError, 
 	     "eventloop_watchdog is not implemented on Ruby VM.");
 #endif
@@ -2442,10 +2503,17 @@ lib_thread_callback(argc, argv, self)
     /* ckfree((char*)q); */
 
     if (NIL_P(rbtk_pending_exception)) {
+#ifdef RUBY_VM
         /* return rb_errinfo(); */
         if (status) {
             rb_exc_raise(rb_errinfo());
         }
+#else
+        /* return ruby_errinfo; */
+        if (status) {
+            rb_exc_raise(ruby_errinfo);
+        }
+#endif
     } else {
         VALUE exc = rbtk_pending_exception;
         rbtk_pending_exception = Qnil;
@@ -2660,50 +2728,94 @@ tcl_protect_core(interp, proc, data) /* should not raise exception */
             goto error;
         error:
             str = rb_str_new2("LocalJumpError: ");
+#ifdef RUBY_VM
             rb_str_append(str, rb_obj_as_string(rb_errinfo()));
+#else
+            rb_str_append(str, rb_obj_as_string(ruby_errinfo));
+#endif
             exc = rb_exc_new3(type, str);
             break;
 
         case TAG_RETRY:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 DUMP1("rb_protect: retry");
                 exc = rb_exc_new2(eTkCallbackRetry, "retry jump error");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
         case TAG_REDO:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 DUMP1("rb_protect: redo");
                 exc = rb_exc_new2(eTkCallbackRedo,  "redo jump error");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
         case TAG_RAISE:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 exc = rb_exc_new2(rb_eException, "unknown exception");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
         case TAG_FATAL:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 exc = rb_exc_new2(rb_eFatal, "FATAL");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
         case TAG_THROW:
+#ifdef RUBY_VM
             if (NIL_P(rb_errinfo())) {
+#else
+            if (NIL_P(ruby_errinfo)) {
+#endif
                 DUMP1("rb_protect: throw");
                 exc = rb_exc_new2(eTkCallbackThrow,  "throw jump error");
             } else {
+#ifdef RUBY_VM
                 exc = rb_errinfo();
+#else
+                exc = ruby_errinfo;
+#endif
             }
             break;
 
@@ -2811,11 +2923,17 @@ tcl_protect(interp, proc, data)
     int code;
 
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on tcl_protect()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on tcl_protect()");
+    }
+#endif
 #endif
 
     rb_trap_immediate = 0;
@@ -3095,21 +3213,22 @@ ip_ruby_cmd(clientData, interp, argc, argv)
 
     /* get args */
     args = rb_ary_new2(argc - 2);
-#ifdef HAVE_STRUCT_RARRAY_LEN
+#ifdef RUBY_VM
+#else
     RARRAY(args)->len = 0;
 #endif
     for(i = 3; i < argc; i++) {
 #if TCL_MAJOR_VERSION >= 8
         str = Tcl_GetStringFromObj(argv[i], &len);
         DUMP2("arg:%s",str);
-#ifndef HAVE_STRUCT_RARRAY_LEN
+#ifdef RUBY_VM
 	rb_ary_push(args, rb_tainted_str_new(str, len));
 #else
         RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new(str, len);
 #endif
 #else /* TCL_MAJOR_VERSION < 8 */
         DUMP2("arg:%s",argv[i]);
-#ifndef HAVE_STRUCT_RARRAY_LEN
+#ifdef RUBY_VM
 	rb_ary_push(args, rb_tainted_str_new2(argv[i]));
 #else
         RARRAY(args)->ptr[RARRAY(args)->len++] = rb_tainted_str_new2(argv[i]);
@@ -3310,11 +3429,17 @@ ip_rbUpdateCommand(clientData, interp, objc, objv)
         return TCL_ERROR;
     }
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on ip_ruby_eval()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on ip_ruby_eval()");
+    }
+#endif
 #endif
 
     Tcl_ResetResult(interp);
@@ -3461,11 +3586,17 @@ ip_rb_threadUpdateCommand(clientData, interp, objc, objv)
         return TCL_ERROR;
     }
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on ip_rb_threadUpdateCommand()");
+    }
+#endif
 #endif
 
     if (rb_thread_alone() 
@@ -3654,11 +3785,17 @@ ip_rbVwaitCommand(clientData, interp, objc, objv)
 
     Tcl_Preserve(interp);
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
         rb_bug("cross-thread violation on ip_rbVwaitCommand()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+        rb_bug("cross-thread violation on ip_rbVwaitCommand()");
+    }
+#endif
 #endif
 
     Tcl_ResetResult(interp);
@@ -5407,10 +5544,19 @@ ip_init(argc, argv, self)
     Tk_Window mainWin = (Tk_Window)NULL;
 
     /* security check */
+#ifdef RUBY_VM
     if (rb_safe_level() >= 4) {
+#else
+    if (ruby_safe_level >= 4) {
+#endif
         rb_raise(rb_eSecurityError, 
                  "Cannot create a TclTkIp object at level %d", 
-                 rb_safe_level());
+#ifdef RUBY_VM
+                 rb_safe_level()
+#else
+                 ruby_safe_level
+#endif
+                 );
     }
 
     /* create object */
@@ -5418,7 +5564,7 @@ ip_init(argc, argv, self)
     ptr = ALLOC(struct tcltkip);
     /* ptr = (struct tcltkip *)ckalloc(sizeof(struct tcltkip)); */
     DATA_PTR(self) = ptr;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     ptr->tk_thread_id = 0;
 #endif
     ptr->ref_count = 0;
@@ -5528,7 +5674,7 @@ ip_init(argc, argv, self)
                           (Tcl_PackageInitProc *) NULL);
 #endif
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
         /* set Tk thread ID */
         ptr->tk_thread_id = Tcl_GetCurrentThread();
 #endif
@@ -5650,7 +5796,7 @@ ip_create_slave_core(interp, argc, argv)
 #endif
 
     /* create slave-ip */
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     /* slave->tk_thread_id = 0; */
     slave->tk_thread_id = master->tk_thread_id; /* == current thread */
 #endif
@@ -6107,13 +6253,13 @@ get_str_from_obj(obj)
 #endif
     str = s ? rb_str_new(s, len) : rb_str_new2("");
     if (binary) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
       rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
       rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
 #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
     } else {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
       rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
 #endif
       rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
@@ -6142,7 +6288,7 @@ get_obj_from_str(str)
             /* text string */
             return Tcl_NewStringObj(s, RSTRING_LEN(str));
         }
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
         /* binary string */
         return Tcl_NewByteArrayObj(s, RSTRING_LEN(str));
@@ -6312,7 +6458,7 @@ tk_funcall(func, argc, argv, obj)
         ptr = (struct tcltkip *)NULL;
     }
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (ptr) {
       /* on Tcl interpreter */
       is_tk_evloop_thread = (ptr->tk_thread_id == (Tcl_ThreadId) 0 
@@ -6388,7 +6534,7 @@ tk_funcall(func, argc, argv, obj)
 
     /* add the handler to Tcl event queue */
     DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (ptr && ptr->tk_thread_id) {
       /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, 
 			   &(callq->ev), TCL_QUEUE_HEAD); */
@@ -6535,19 +6681,35 @@ ip_eval_real(self, cmd_str, cmd_len)
           ret = rb_protect(call_tcl_eval, (VALUE)&inf, &status);
           switch(status) {
           case TAG_RAISE:
+#ifdef RUBY_VM
               if (NIL_P(rb_errinfo())) {
+#else
+              if (NIL_P(ruby_errinfo)) {
+#endif
                   rbtk_pending_exception = rb_exc_new2(rb_eException, 
                                                        "unknown exception");
               } else {
+#ifdef RUBY_VM
                   rbtk_pending_exception = rb_errinfo();
+#else
+                  rbtk_pending_exception = ruby_errinfo;
+#endif
               }
               break;
 
           case TAG_FATAL:
+#ifdef RUBY_VM
               if (NIL_P(rb_errinfo())) {
+#else
+              if (NIL_P(ruby_errinfo)) {
+#endif
                   rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
               } else {
+#ifdef RUBY_VM
                   rbtk_pending_exception = rb_errinfo();
+#else
+                  rbtk_pending_exception = ruby_errinfo;
+#endif
               }
           }
 #endif
@@ -6711,11 +6873,17 @@ eval_queue_handler(evPtr, flags)
     /* check safe-level */
     if (rb_safe_level() != q->safe_level) {
 #ifdef HAVE_NATIVETHREAD
-#ifndef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
+#if 0
     if (!ruby_native_thread_p()) {
       rb_bug("cross-thread violation on eval_queue_handler()");
     }
 #endif
+#else
+    if (!is_ruby_native_thread()) {
+      rb_bug("cross-thread violation on eval_queue_handler()");
+    }
+#endif
 #endif
         /* q_dat = Data_Wrap_Struct(rb_cData,0,-1,q); */
         q_dat = Data_Wrap_Struct(rb_cData,eval_queue_mark,-1,q);
@@ -6772,7 +6940,7 @@ ip_eval(self, str)
     VALUE str;
 {
     struct eval_queue *evq;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     struct tcltkip *ptr;
 #endif
     char *eval_str;
@@ -6789,12 +6957,12 @@ ip_eval(self, str)
     StringValue(str);
     rb_thread_critical = thr_crit_bup;
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     ptr = get_ip(ip_obj);
 #endif
 
     if (
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
 	&& 
 #endif
@@ -6857,7 +7025,7 @@ ip_eval(self, str)
 
     /* add the handler to Tcl event queue */
     DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (ptr->tk_thread_id) {
       /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(evq->ev), position); */
       Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)evq, position);
@@ -7079,7 +7247,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
         if (TYPE(str) == T_STRING) {
             volatile VALUE enc;
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
             enc = rb_funcall(rb_obj_encoding(str), ID_to_s, 0, 0);
 #else
             enc = rb_attr_get(str, ID_at_enc);
@@ -7109,7 +7277,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
             } else {
                 StringValue(enc);
                 if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 		    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
 		    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7129,7 +7297,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
     } else {
         StringValue(encodename);
 	if (strcmp(RSTRING_PTR(encodename), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 	  rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
 	  rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7166,7 +7334,7 @@ lib_toUTF8_core(ip_obj, src, encodename)
     /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
     /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
 #endif
     rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
@@ -7259,14 +7427,14 @@ lib_fromUTF8_core(ip_obj, src, encodename)
             if (!NIL_P(enc)) {
                 StringValue(enc);
                 if (strcmp(RSTRING_PTR(enc), "binary") == 0) {
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 		    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
 		    rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
                     rb_thread_critical = thr_crit_bup;
                     return str;
                 }
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 	    } else if (rb_enc_get_index(str) == ENCODING_INDEX_BINARY) {
 	        rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 		rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7315,7 +7483,7 @@ lib_fromUTF8_core(ip_obj, src, encodename)
             str = rb_tainted_str_new(s, len);
 	    s = (char*)NULL;
 	    Tcl_DecrRefCount(tclstr);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 	    rb_enc_associate_index(str, ENCODING_INDEX_BINARY);
 #endif
             rb_ivar_set(str, ID_at_enc, ENCODING_NAME_BINARY);
@@ -7357,7 +7525,7 @@ lib_fromUTF8_core(ip_obj, src, encodename)
     /* str = rb_tainted_str_new2(Tcl_DStringValue(&dstr)); */
     /* str = rb_str_new2(Tcl_DStringValue(&dstr)); */
     str = rb_str_new(Tcl_DStringValue(&dstr), Tcl_DStringLength(&dstr));
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     if (interp) {
       /* can access encoding_table of TclTkIp */
       /*   ->  try to use encoding_table      */
@@ -7466,7 +7634,7 @@ lib_UTF_backslash_core(self, str, all_bs)
 
     str = rb_str_new(dst_buf, dst_len);
     if (taint_flag) OBJ_TAINT(str);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     rb_enc_associate_index(str, ENCODING_INDEX_UTF8);
 #endif
     rb_ivar_set(str, ID_at_enc, ENCODING_NAME_UTF8);
@@ -7771,19 +7939,35 @@ ip_invoke_core(interp, argc, argv)
     ret = rb_protect(invoke_tcl_proc, (VALUE)&inf, &status);
     switch(status) {
     case TAG_RAISE:
+#ifdef RUBY_VM
         if (NIL_P(rb_errinfo())) {
+#else
+        if (NIL_P(ruby_errinfo)) {
+#endif
             rbtk_pending_exception = rb_exc_new2(rb_eException, 
                                                  "unknown exception");
         } else {
+#ifdef RUBY_VM
             rbtk_pending_exception = rb_errinfo();
+#else
+            rbtk_pending_exception = ruby_errinfo;
+#endif
         }
         break;
         
     case TAG_FATAL:
+#ifdef RUBY_VM
         if (NIL_P(rb_errinfo())) {
+#else
+        if (NIL_P(ruby_errinfo)) {
+#endif
             rbtk_pending_exception = rb_exc_new2(rb_eFatal, "FATAL");
         } else {
+#ifdef RUBY_VM
             rbtk_pending_exception = rb_errinfo();
+#else
+            rbtk_pending_exception = ruby_errinfo;
+#endif
         }
     }
 
@@ -8167,7 +8351,7 @@ ip_invoke_with_position(argc, argv, obj, position)
     Tcl_QueuePosition position;
 {
     struct invoke_queue *ivq;
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     struct tcltkip *ptr;
 #endif
     int  *alloc_done;
@@ -8187,7 +8371,7 @@ ip_invoke_with_position(argc, argv, obj, position)
         rb_raise(rb_eArgError, "command name missing");
     }
 
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     ptr = get_ip(ip_obj);
     DUMP2("status: ptr->tk_thread_id %d", ptr->tk_thread_id);
 #endif
@@ -8195,7 +8379,7 @@ ip_invoke_with_position(argc, argv, obj, position)
     DUMP2("status: eventloopt_thread %lx", eventloop_thread);
 
     if (
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
 	(ptr->tk_thread_id == 0 || ptr->tk_thread_id == Tcl_GetCurrentThread())
 	&& 
 #endif
@@ -8251,7 +8435,7 @@ ip_invoke_with_position(argc, argv, obj, position)
 
     /* add the handler to Tcl event queue */
     DUMP1("add handler");
-#ifdef RUBY_USE_NATIVE_THREAD
+#ifdef RUBY_VM
     if (ptr->tk_thread_id) {
       /* Tcl_ThreadQueueEvent(ptr->tk_thread_id, &(ivq->ev), position); */
       Tcl_ThreadQueueEvent(ptr->tk_thread_id, (Tcl_Event*)ivq, position);
@@ -8777,7 +8961,7 @@ lib_split_tklist_core(ip_obj, list_str)
     volatile VALUE ary, elem;
     int idx;
     int taint_flag = OBJ_TAINTED(list_str);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     int list_enc_idx;
     volatile VALUE list_ivar_enc;
 #endif
@@ -8795,7 +8979,7 @@ lib_split_tklist_core(ip_obj, list_str)
     }
 
     StringValue(list_str);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     list_enc_idx = rb_enc_get_index(list_str);
     list_ivar_enc = rb_ivar_get(list_str, ID_at_enc);
 #endif
@@ -8837,7 +9021,7 @@ lib_split_tklist_core(ip_obj, list_str)
 
         for(idx = 0; idx < objc; idx++) {
             elem = get_str_from_obj(objv[idx]);
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 	    if (rb_enc_get_index(elem) == ENCODING_INDEX_BINARY) {
 	        rb_enc_associate_index(elem, ENCODING_INDEX_BINARY);
 		rb_ivar_set(elem, ID_at_enc, ENCODING_NAME_BINARY);
@@ -9170,7 +9354,7 @@ create_dummy_encoding_for_tk_core(interp, name, error_mode)
   }
 #endif
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
   if (RTEST(rb_define_dummy_encoding(RSTRING_PTR(name)))) {
     int idx = rb_enc_find_index(StringValueCStr(name));
     return rb_enc_from_encoding(rb_enc_from_index(idx));
@@ -9195,7 +9379,7 @@ create_dummy_encoding_for_tk(interp, name)
 }
 
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 static int
 update_encoding_table(table, interp, error_mode)
      VALUE table;
@@ -9369,7 +9553,7 @@ encoding_table_get_obj_core(table, enc, error_mode)
   }
 }
 
-#else /* ! HAVE_RUBY_ENCODING_H */
+#else /* ! RUBY_VM */
 #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
 static int
 update_encoding_table(table, interp, error_mode)
@@ -9496,7 +9680,7 @@ encoding_table_get_obj(table, enc)
   return encoding_table_get_obj_core(table, enc, Qtrue);
 }
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
 static VALUE
 create_encoding_table(interp)
      VALUE interp;
@@ -9586,7 +9770,7 @@ create_encoding_table(interp)
   return table;
 }
 
-#else /* ! HAVE_RUBY_ENCODING_H */
+#else /* ! RUBY_VM */
 #if TCL_MAJOR_VERSION > 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION >= 1)
 static VALUE
 create_encoding_table(interp)
@@ -9819,9 +10003,9 @@ Init_tcltklib()
 
     /* --------------------------------------------------------------- */
 
-#ifdef HAVE_RUBY_ENCODING_H
+#ifdef RUBY_VM
     rb_global_variable(&cRubyEncoding);
-    cRubyEncoding = rb_path2class("Encoding");
+    cRubyEncoding = rb_const_get(rb_cObject, rb_intern("Encoding"));
 
     ENCODING_INDEX_UTF8   = rb_enc_to_index(rb_utf8_encoding());
     ENCODING_INDEX_BINARY = rb_enc_find_index("binary");
@@ -10077,7 +10261,11 @@ Init_tcltklib()
 
     /* if ruby->nativethread-supprt and tcltklib->doen't, 
        the following will cause link-error. */
+#ifdef RUBY_VM
     ruby_native_thread_p();
+#else
+    is_ruby_native_thread();
+#endif
 
     /* --------------------------------------------------------------- */
 
diff --git a/ext/tk/tkutil/extconf.rb b/ext/tk/tkutil/extconf.rb
index ed5de0ee64..015bc3a45e 100644
--- a/ext/tk/tkutil/extconf.rb
+++ b/ext/tk/tkutil/extconf.rb
@@ -7,9 +7,7 @@ end
 
 if has_tk
   require 'mkmf'
-  have_header("ruby/ruby.h")
   have_func("rb_obj_instance_exec", "ruby.h")
-  have_func("rb_sym_to_s", "ruby.h")
   have_func("strndup", "string.h")
   create_makefile('tkutil')
 end
diff --git a/ext/tk/tkutil/tkutil.c b/ext/tk/tkutil/tkutil.c
index fb07efbc03..00d719143b 100644
--- a/ext/tk/tkutil/tkutil.c
+++ b/ext/tk/tkutil/tkutil.c
@@ -11,7 +11,7 @@
 
 #include "ruby.h"
 
-#ifdef HAVE_RUBY_RUBY_H
+#ifdef RUBY_VM  /* Ruby 1.9 */
 /* #include "ruby/ruby.h" */
 #include "ruby/signal.h"
 #include "ruby/st.h"
@@ -117,8 +117,8 @@ tk_do_callback(argc, argv, self)
                        ID_call, argc - 1, argv + 1);
 }
 
-static const char cmd_id_head[] = "ruby_cmd TkUtil callback ";
-static const char cmd_id_prefix[] = "cmd";
+static char *cmd_id_head = "ruby_cmd TkUtil callback ";
+static char *cmd_id_prefix = "cmd";
 
 static VALUE
 tk_install_cmd_core(cmd)
@@ -791,7 +791,7 @@ get_eval_string_core(obj, enc_flag, self)
                 return fromDefaultEnc_toUTF8(rb_str_new2(rb_id2name(SYM2ID(obj))), self);
             }
         } else {
-#ifdef HAVE_RB_SYM_TO_S
+#ifdef RUBY_VM
             return rb_sym_to_s(obj);
 #else
             return rb_str_new2(rb_id2name(SYM2ID(obj)));
diff --git a/lib/mathn.rb b/lib/mathn.rb
index a5a121c6c6..482a4f366a 100644
--- a/lib/mathn.rb
+++ b/lib/mathn.rb
@@ -201,7 +201,7 @@ class Rational
       neard = self.denominator.to_f ** (1.0/other.denominator.to_f)
       loop do
 	if (neard**other.denominator == self.denominator)
-	  dem = neaed
+	  dem = neard
 	  break
 	end
       end
diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb
index 4c67d19c60..de15ab5508 100644
--- a/test/stringio/test_stringio.rb
+++ b/test/stringio/test_stringio.rb
@@ -40,17 +40,4 @@ class TestStringIO < Test::Unit::TestCase
     end
     assert_equal("hacker\nother ruby\n", stringio.string)
   end
-  
-  def test_reopen
-    f = StringIO.new("foo\nbar\nbaz\n")
-    assert_equal("foo\n", f.gets)
-    f.reopen("qux\nquux\nquuux\n")
-    assert_equal("qux\n", f.gets)
-
-    f2 = StringIO.new("")
-    f2.reopen(f)
-    assert_equal("quux\n", f2.gets)
-  ensure
-    f.close unless f.closed?
-  end
 end
diff --git a/version.h b/version.h
index c49f9c631e..06fc7e8f0e 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-19"
+#define RUBY_RELEASE_DATE "2008-06-20"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080619
+#define RUBY_RELEASE_CODE 20080620
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 20
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];