diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-30 15:00:12 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-30 15:00:12 +0000 |
commit | ef260b085eea729efaa46e93ac71d08a3fa210c6 (patch) | |
tree | 3771797df1d09540f20d74f55086885490e6a439 /ext/tk/stubs.c | |
parent | 3730710d79aa0bde6ab5b36e18c734dd9718aac0 (diff) | |
download | ruby-ef260b085eea729efaa46e93ac71d08a3fa210c6.tar.gz |
revert git backfire in r15860; sorry
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15861 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tk/stubs.c')
-rw-r--r-- | ext/tk/stubs.c | 64 |
1 files changed, 61 insertions, 3 deletions
diff --git a/ext/tk/stubs.c b/ext/tk/stubs.c index d0aaf61f31..6d3b330f0e 100644 --- a/ext/tk/stubs.c +++ b/ext/tk/stubs.c @@ -1,5 +1,11 @@ +/************************************************ + + stubs.c - Tcl/Tk stubs support + +************************************************/ + +#include "ruby.h" #include "stubs.h" -#include "ruby/ruby.h" #include <tcl.h> #include <tk.h> @@ -86,7 +92,12 @@ 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; @@ -168,7 +179,12 @@ 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() ); } @@ -187,7 +203,12 @@ 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; @@ -269,7 +290,12 @@ 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); @@ -304,7 +330,12 @@ ruby_tk_stubs_init(Tcl_Interp *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); @@ -390,7 +421,12 @@ 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); @@ -402,7 +438,8 @@ ruby_open_tcl_dll(char *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)); */ @@ -412,7 +449,13 @@ int ruby_open_tk_dll() return TCLTK_STUBS_OK; } -int ruby_open_tcltk_dll(char *appname) +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() ); } @@ -430,7 +473,12 @@ 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; @@ -458,7 +506,12 @@ 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; @@ -474,7 +527,12 @@ ruby_tk_stubs_init(Tcl_Interp *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) |