From 1cf49eb9f39ac128bdbb0c99527a903d6fe71130 Mon Sep 17 00:00:00 2001
From: nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 29 Aug 2004 05:12:00 +0000
Subject: * 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
---
 ext/tcltklib/tcltklib.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ext/tcltklib')

diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c
index 2792e53388..0217ab8feb 100644
--- a/ext/tcltklib/tcltklib.c
+++ b/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 ----*/
-- 
cgit v1.2.3