summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/tk/extconf.rb3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index edc26901bc..0e87710859 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jun 29 23:09:14 2011 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * ex/tk/extconf.rb: support for the latest ActiveTcl with mingw.
+
Wed Jun 29 22:49:10 2011 Keiju Ishitsuka <keiju@ishitsuka.com>
* lib/irb/cmd/help.rb: support RDoc 3.7. fix [Bug #3760].
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 1f4f37a215..2f68d01e7f 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -2021,6 +2021,9 @@ if (TkLib_Config["tcltk-framework"] ||
$defs << %[-DRUBY_VERSION=\\"#{RUBY_VERSION}\\"]
$defs << %[-DRUBY_RELEASE_DATE=\\"#{RUBY_RELEASE_DATE}\\"]
+ # remove harmful definitions.
+ $defs.delete_if{|x|/^-Du?intptr_t=/ =~ x}
+
create_makefile("tcltklib")
puts "\nFind Tcl/Tk libraries. Make tcltklib.so which is required by Ruby/Tk."