matz

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

3 files changed, 12 insertions, 7 deletions

diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 6efcf45986..5b94f975a2 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -422,7 +422,11 @@ TARGET = #{target}
 DLLIB = $(TARGET).#{$static ? $LIBEXT : "@DLEXT@"}
 
 RUBY = #{ruby_interpreter} -I$(topdir) -I$(hdrdir)/lib
+<<<<<<< extmk.rb.in
+RM = $(RUBY) -r ftools -e "File::rm_f *Dir[ARGV.join(' ')]"
+=======
 RM = $(RUBY) -r ftools -e 'File::rm_f(*Dir[ARGV.join(" ")])'
+>>>>>>> 1.20
 
 EXEEXT = @EXEEXT@
 
diff --git a/ext/tcltklib/tcltklib.c b/ext/tcltklib/tcltklib.c
index 93f7745f28..f2e4a22945 100644
--- a/ext/tcltklib/tcltklib.c
+++ b/ext/tcltklib/tcltklib.c
@@ -4,12 +4,13 @@
  *		Oct. 24, 1997	Y. Matsumoto
  */
 
+#include "ruby.h"
+#include "rubysig.h"
+#undef EXTERN	/* avoid conflict with tcl.h of tcl8.2 or before */
 #include <stdio.h>
 #include <string.h>
 #include <tcl.h>
 #include <tk.h>
-#include "ruby.h"
-#include "rubysig.h"
 
 #ifdef __MACOS__
 # include <tkMac.h>
@@ -228,11 +229,11 @@ ip_new(self)
     /* add ruby command to the interpreter */
 #if TCL_MAJOR_VERSION >= 8
     DUMP1("Tcl_CreateObjCommand(\"ruby\")");
-    Tcl_CreateObjCommand(ptr->ip, "ruby", ip_ruby, (ClientData *)NULL,
+    Tcl_CreateObjCommand(ptr->ip, "ruby", ip_ruby, (ClientData)NULL,
 			 (Tcl_CmdDeleteProc *)NULL);
 #else
     DUMP1("Tcl_CreateCommand(\"ruby\")");
-    Tcl_CreateCommand(ptr->ip, "ruby", ip_ruby, (ClientData *)NULL,
+    Tcl_CreateCommand(ptr->ip, "ruby", ip_ruby, (ClientData)NULL,
 		      (Tcl_CmdDeleteProc *)NULL);
 #endif
 
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index a696d3b9bf..b495a2e2d1 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -527,15 +527,15 @@ module TkCore
     tk_call 'tk_messageBox', *hash_kv(keys)
   end
 
-  def getOpenFile(keys)
+  def getOpenFile(keys = nil)
     tk_call 'tk_getOpenFile', *hash_kv(keys)
   end
 
-  def getSaveFile(keys)
+  def getSaveFile(keys = nil)
     tk_call 'tk_getSaveFile', *hash_kv(keys)
   end
 
-  def chooseColor(keys)
+  def chooseColor(keys = nil)
     tk_call 'tk_chooseColor', *hash_kv(keys)
   end