990715

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

4 files changed, 16 insertions, 18 deletions

diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index d3ff174894..0d1d5af276 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -439,11 +439,6 @@ $(DLLIB): $(OBJS)
 $(DLLIB): $(OBJS)
 	ar cru $(DLLIB) $(OBJS)
 "
-  elsif PLATFORM =~ "-nextstep" || PLATFORM =~ "-openstep" || PLATFORM =~ "-rhapsody"
-    mfile.printf "\
-$(DLLIB): $(OBJS)
-	cc -r $(CFLAGS) -o $(DLLIB) $(OBJS)
-"
   else
     mfile.printf "\
 $(DLLIB): $(OBJS)
diff --git a/ext/extmk.rb.nt b/ext/extmk.rb.nt
index 509bca398d..531abf7b29 100644
--- a/ext/extmk.rb.nt
+++ b/ext/extmk.rb.nt
@@ -61,8 +61,8 @@ end
 
 CFLAGS = ""
 #LINK = "cl -o conftest.exe -I../.. -Zi -O -I. %s  conftest.c %s >  nul"
-LINK = "cl -o conftest.exe -Zi -O  %s  conftest.c %s >  nul"
-CPP = "cl -E  -I../.. -I../../missing -I../../win32 -I. -Zi -O %s conftest.c >  nul"
+LINK = "cl -o conftest.exe -Zi -O  %s  conftest.c %s %s >  nul"
+CPP = "cl -E  -I#{$ruby_inc} -I#{$ruby_inc}/missing -I#{$ruby_inc}/win32 -I. -Zi -O %s conftest.c >  nul"
 $null = open("nul", "w")
 
 $orgerr = $stderr.dup
@@ -322,7 +322,7 @@ VPATH = .
 
 CC = cl
 
-CFLAGS   = %s -I../.. -I../../missing -I../../win32 -I. -O -DNT %s #{CFLAGS} #{$CFLAGS} %s
+CFLAGS   = %s -I#{$ruby_inc} -I#{$ruby_inc}/missing -I#{$ruby_inc}/win32 -I. -O -DNT %s #{CFLAGS} #{$CFLAGS} %s
 
 RUBYLIB  = ../../ruby.lib
 DLDFLAGS =  /DLL
diff --git a/ext/pty/pty.c b/ext/pty/pty.c
index 0438ca7e9b..2cd8d6f9a4 100644
--- a/ext/pty/pty.c
+++ b/ext/pty/pty.c
@@ -8,7 +8,11 @@
 #if !defined(HAVE_OPENPTY) && !defined(HAVE__GETPTY)
 #include	<sys/ioctl.h>
 #endif
+#ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#else
+#define WIFSTOPPED(status)    (((status) & 0xff) == 0x7f)
+#endif
 #include <ctype.h>
 
 #include <ruby.h>
@@ -160,7 +164,7 @@ chld_changed()
 #ifdef HAVE_WAITPID
 	cpid = waitpid(-1, &statusp, WUNTRACED|WNOHANG);
 #else
-	cpid = wait3((int *) &statusp, WUNTRACED|WNOHANG, 0);
+	cpid = wait3(&statusp, WUNTRACED|WNOHANG, 0);
 #endif
 	if (cpid == 0 || cpid == -1)
 	    return;
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 1a1c6557d4..2b4b504b0a 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -753,10 +753,9 @@ class TkVariable
       if INTERP._eval(format('global %s; array exists %s', @id, @id)) != "1"
 	raise
       else
-	INTERP._eval(format('global %s; unset %s'), @id, @id)
 	if val == []
-	  INTERP._eval(format('global %s; set %s(0) 0; unset %s(0)', 
-			      @id, @id, @id))
+	  INTERP._eval(format('global %s; unset %s; set %s(0) 0; unset %s(0)', 
+			      @id, @id, @id, @id))
 	elsif val.kind_of?(Array)
 	  a = []
 	  val.each_with_index{|e,i| a.push(i); a.push(array2tk_list(e))}
@@ -857,7 +856,7 @@ class TkVariable
       Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
     else
       newopts = @trace_opts.dup
-      opts.each_byte{|c| newopts += c.chr unless @newopts.index(c)}
+      opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
       if newopts != @trace_opts
 	Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
 	@trace_opts.replace(newopts)
@@ -877,7 +876,7 @@ class TkVariable
       Tk.tk_call('trace', 'variable', @id, @trace_opts, 'rb_var')
     else
       newopts = @trace_opts.dup
-      opts.each_byte{|c| newopts += c.chr unless @newopts.index(c)}
+      opts.each_byte{|c| newopts += c.chr unless newopts.index(c)}
       if newopts != @trace_opts
 	Tk.tk_call('trace', 'vdelete', @id, @trace_opts, 'rb_var')
 	@trace_opts.replace(newopts)
@@ -2191,12 +2190,12 @@ class TkListbox<TkTextWin
   def selection_set(first, last=None)
     tk_send 'selection', 'set', first, last
   end
-  def xview(cmd, index, *more)
-    v = tk_send('xview', cmd, index, *more)
+  def xview(cmd, *more)
+    v = tk_send('xview', cmd, *more)
     v.to_i if more.size == 0
   end
-  def yview(cmd, index, *more)
-    v = tk_send('yview', cmd, index, *more)
+  def yview(cmd, *more)
+    v = tk_send('yview', cmd, *more)
     v.to_i if more.size == 0
   end
 end