mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/tcltklib/stubs.c (ruby_tcltk_stubs): need to call
Tcl_FindExecutable() for Tcl/Tk 8.4. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6785 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8d906bd08e
commit
1d1ad956cb
2 changed files with 14 additions and 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>
|
Wed Aug 18 12:52:55 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* eval.c (rb_obj_instance_eval): evaluates under special singleton
|
* eval.c (rb_obj_instance_eval): evaluates under special singleton
|
||||||
|
|
|
@ -34,8 +34,9 @@ ruby_tcltk_stubs()
|
||||||
{
|
{
|
||||||
DL_HANDLE tcl_dll;
|
DL_HANDLE tcl_dll;
|
||||||
DL_HANDLE tk_dll;
|
DL_HANDLE tk_dll;
|
||||||
|
void (*p_Tcl_FindExecutable)(const char *);
|
||||||
Tcl_Interp *(*p_Tcl_CreateInterp)();
|
Tcl_Interp *(*p_Tcl_CreateInterp)();
|
||||||
int (*p_Tk_Init) _((Tcl_Interp *));
|
int (*p_Tk_Init)(Tcl_Interp *);
|
||||||
Tcl_Interp *tcl_ip;
|
Tcl_Interp *tcl_ip;
|
||||||
int n;
|
int n;
|
||||||
char *ruby_tcl_dll = 0;
|
char *ruby_tcl_dll = 0;
|
||||||
|
@ -72,6 +73,12 @@ ruby_tcltk_stubs()
|
||||||
if (!tcl_dll || !tk_dll)
|
if (!tcl_dll || !tk_dll)
|
||||||
return -1;
|
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");
|
p_Tcl_CreateInterp = (Tcl_Interp *(*)())DL_SYM(tcl_dll, "Tcl_CreateInterp");
|
||||||
if (!p_Tcl_CreateInterp)
|
if (!p_Tcl_CreateInterp)
|
||||||
return -2;
|
return -2;
|
||||||
|
@ -80,7 +87,7 @@ ruby_tcltk_stubs()
|
||||||
if (!tcl_ip)
|
if (!tcl_ip)
|
||||||
return -3;
|
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)
|
if (!p_Tk_Init)
|
||||||
return -4;
|
return -4;
|
||||||
(*p_Tk_Init)(tcl_ip);
|
(*p_Tk_Init)(tcl_ip);
|
||||||
|
|
Loading…
Reference in a new issue