1 files changed, 3 insertions, 61 deletions

diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c
index 6d3b330f0e..d0aaf61f31 100644
--- a/ext/tk/stubs.c
+++ b/ext/tk/stubs.c
@@ -1,11 +1,5 @@
-/************************************************
-
-  stubs.c - Tcl/Tk stubs support
-
-************************************************/
-
-#include "ruby.h"
 #include "stubs.h"
+#include "ruby/ruby.h"
 #include <tcl.h>
 #include <tk.h>
 
@@ -92,12 +86,7 @@ static DL_HANDLE tcl_dll = (DL_HANDLE)0;
 static DL_HANDLE tk_dll  = (DL_HANDLE)0;
 
 int
-#ifdef RUBY_VM
 ruby_open_tcl_dll(char *appname)
-#else
-ruby_open_tcl_dll(appname)
-    char *appname;
-#endif
 {
     void (*p_Tcl_FindExecutable)(const char *);
     int n;
@@ -179,12 +168,7 @@ ruby_open_tk_dll()
 }
 
 int
-#ifdef RUBY_VM
 ruby_open_tcltk_dll(char *appname)
-#else
-ruby_open_tcltk_dll(appname)
-    char *appname;
-#endif
 {
     return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() );
 }
@@ -203,12 +187,7 @@ tk_stubs_init_p()
 
 
 Tcl_Interp *
-#ifdef RUBY_VM
 ruby_tcl_create_ip_and_stubs_init(int *st)
-#else
-ruby_tcl_create_ip_and_stubs_init(st)
-    int *st;
-#endif
 {
     Tcl_Interp *tcl_ip;
 
@@ -290,12 +269,7 @@ ruby_tcl_stubs_init()
 }
 
 int
-#ifdef RUBY_VM
 ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_init(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
 {
     Tcl_ResetResult(tcl_ip);
 
@@ -330,12 +304,7 @@ ruby_tk_stubs_init(tcl_ip)
 }
 
 int
-#ifdef RUBY_VM
 ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_safeinit(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
 {
     Tcl_ResetResult(tcl_ip);
 
@@ -421,12 +390,7 @@ static int open_tcl_dll = 0;
 static int call_tk_stubs_init = 0;
 
 int
-#ifdef RUBY_VM
 ruby_open_tcl_dll(char *appname)
-#else
-ruby_open_tcl_dll(appname)
-    char *appname;
-#endif
 {
     if (appname) {
         Tcl_FindExecutable(appname);
@@ -438,8 +402,7 @@ ruby_open_tcl_dll(appname)
     return TCLTK_STUBS_OK;
 }
 
-int 
-ruby_open_tk_dll()
+int ruby_open_tk_dll()
 {
     if (!open_tcl_dll) {
         /* ruby_open_tcl_dll(RSTRING_PTR(rb_argv0)); */
@@ -449,13 +412,7 @@ ruby_open_tk_dll()
     return TCLTK_STUBS_OK;
 }
 
-int 
-#ifdef RUBY_VM
-ruby_open_tcltk_dll(char *appname)
-#else
-ruby_open_tcltk_dll(appname)
-    char *appname;
-#endif
+int ruby_open_tcltk_dll(char *appname)
 {
     return( ruby_open_tcl_dll(appname) || ruby_open_tk_dll() );
 }
@@ -473,12 +430,7 @@ tk_stubs_init_p()
 }
 
 Tcl_Interp *
-#ifdef RUBY_VM
 ruby_tcl_create_ip_and_stubs_init(int *st)
-#else
-ruby_tcl_create_ip_and_stubs_init(st)
-    int *st;
-#endif
 {
     Tcl_Interp *tcl_ip;
 
@@ -506,12 +458,7 @@ ruby_tcl_stubs_init()
 }
 
 int 
-#ifdef RUBY_VM
 ruby_tk_stubs_init(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_init(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
 {
     if (Tk_Init(tcl_ip) == TCL_ERROR)
         return FAIL_Tk_Init;
@@ -527,12 +474,7 @@ ruby_tk_stubs_init(tcl_ip)
 }
 
 int
-#ifdef RUBY_VM
 ruby_tk_stubs_safeinit(Tcl_Interp *tcl_ip)
-#else
-ruby_tk_stubs_safeinit(tcl_ip)
-    Tcl_Interp *tcl_ip;
-#endif
 {
 #if TCL_MAJOR_VERSION >= 8
     if (Tk_SafeInit(tcl_ip) == TCL_ERROR)