diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/tcltklib/stubs.c | 11 |
2 files changed, 14 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Wed Aug 18 17:10:12 2004 WATANABE Hirofumi <eban@ruby-lang.org> + + * ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call + Tcl_FindExecutable() for Tcl/Tk 8.4. + Wed Aug 18 12:52:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (rb_obj_instance_eval): evaluates under special singleton diff --git a/ext/tcltklib/stubs.c b/ext/tcltklib/stubs.c index 56cc8ca921..8faa4ca24e 100644 --- a/ext/tcltklib/stubs.c +++ b/ext/tcltklib/stubs.c @@ -34,8 +34,9 @@ ruby_tcltk_stubs() { DL_HANDLE tcl_dll; DL_HANDLE tk_dll; + void (*p_Tcl_FindExecutable)(const char *); Tcl_Interp *(*p_Tcl_CreateInterp)(); - int (*p_Tk_Init) _((Tcl_Interp *)); + int (*p_Tk_Init)(Tcl_Interp *); Tcl_Interp *tcl_ip; int n; char *ruby_tcl_dll = 0; @@ -72,6 +73,12 @@ ruby_tcltk_stubs() if (!tcl_dll || !tk_dll) return -1; + p_Tcl_FindExecutable = (void (*)(const char *))DL_SYM(tcl_dll, "Tcl_FindExecutable"); + if (!p_Tcl_FindExecutable) + return -7; + + p_Tcl_FindExecutable("ruby"); + p_Tcl_CreateInterp = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_CreateInterp"); if (!p_Tcl_CreateInterp) return -2; @@ -80,7 +87,7 @@ ruby_tcltk_stubs() if (!tcl_ip) return -3; - p_Tk_Init = (int (*) _((Tcl_Interp *)))DL_SYM(tk_dll, "Tk_Init"); + p_Tk_Init = (int (*)(Tcl_Interp *))DL_SYM(tk_dll, "Tk_Init"); if (!p_Tk_Init) return -4; (*p_Tk_Init)(tcl_ip); |