* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]

* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string does not work


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,9 @@
+Sun Aug 29 14:08:56 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* ext/tcltklib/tcltklib.c: compile error on bcc32 [ruby-dev:24081]
+
+	* ext/tk/lib/multi-tk.rb: MultiTkIp#eval_string does not work
+
 Sat Aug 28 23:04:41 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* bignum.c (rb_big_and): protect parameters from GC.

ext/tcltklib/tcltklib.c

@@ -97,7 +97,8 @@ static VALUE ip_invoke _((int, VALUE*, VALUE));
 
 /* from tkAppInit.c */
 
-#if !defined __MINGW32__
+#if TCL_MAJOR_VERSION < 8 || (TCL_MAJOR_VERSION == 8 && TCL_MINOR_VERSION < 4)
+#  if !defined __MINGW32__ && !defined __BORLANDC__
 /*
  * The following variable is a special hack that is needed in order for
  * Sun shared libraries to be used for Tcl.
@@ -105,6 +106,7 @@ static VALUE ip_invoke _((int, VALUE*, VALUE));
 
 extern int matherr();
 int *tclDummyMathPtr = (int *) matherr;
+#  endif
 #endif
 
 /*---- module TclTkLib ----*/

ext/tk/lib/multi-tk.rb

@@ -857,7 +857,7 @@ class MultiTkIp
     if cmd.kind_of?(String)
       xcmd  = cmd
       xargs = args
-      cmd = proc{ TkComm._get_eval_string(TkUtil.eval_cmd(xcmd, *xargs)) }
+      cmd = proc{ TkComm._get_eval_string(eval(xcmd, *xargs)) }
       args = []
     end