summaryrefslogtreecommitdiff
path: root/ext/tcltklib
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-08-06 06:48:25 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>1999-08-06 06:48:25 +0000
commit88b8c7e3ffdbc0116c31b8e9691743567d6e3e34 (patch)
treef3f7b20606f3531ad43c3a75708c4dcf1c37bfee /ext/tcltklib
parentb516f1f25458c78974ff7dc5488b8dfaae997fae (diff)
990806
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_3@509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/tcltklib')
-rw-r--r--ext/tcltklib/extconf.rb4
-rw-r--r--ext/tcltklib/tcltklib.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/ext/tcltklib/extconf.rb b/ext/tcltklib/extconf.rb
index ec06f8b245..e1086855ba 100644
--- a/ext/tcltklib/extconf.rb
+++ b/ext/tcltklib/extconf.rb
@@ -39,8 +39,8 @@ def find_tk(tklib)
end
if have_header("tcl.h") && have_header("tk.h") &&
- find_library("X11", "XOpenDisplay",
- "/usr/X11/lib", "/usr/X11R6/lib", "/usr/openwin/lib") &&
+ (/mswin32/ =~ RUBY_PLATFORM || find_library("X11", "XOpenDisplay",
+ "/usr/X11/lib", "/usr/X11R6/lib", "/usr/openwin/lib")) &&
find_tcl(tcllib) &&
find_tk(tklib)
create_makefile("tcltklib")
diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c
index 314246869e..b1dae089db 100644
--- a/ext/tcltklib/tcltklib.c
+++ b/ext/tcltklib/tcltklib.c
@@ -4,6 +4,10 @@
* Oct. 24, 1997 Y. Matsumoto
*/
+#if defined(NT)
+# include <windows.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <tcl.h>