From 1d1ad956cb33755c80f3d112408044faef047d3e Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 18 Aug 2004 08:14:54 +0000
Subject: * 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
---
 ext/tcltklib/stubs.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'ext')

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);
-- 
cgit v1.2.3