2000-05-01

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

3 files changed, 31 insertions, 39 deletions

diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 4444399f3c..253d9d38b7 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -500,7 +500,7 @@ def extmake(target)
   $objs = nil
   $local_flags = ""
   case RUBY_PLATFORM
-  when /cygwin|beos|openstep|nextstep|rhapsody|i386-os2_emx/
+  when /cygwin|beos|openstep|nextstep|rhapsody|macos|i386-os2_emx/
     $libs = ""
   when /mswin32/
     $LIBEXT = "lib"
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index b168abb284..6a07f43764 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -259,7 +259,8 @@ bsock_getsockopt(sock, lev, optname)
     VALUE sock, lev, optname;
 {
 #if !defined(__BEOS__)
-    int level, option, len;
+    int level, option;
+    socklen_t len;
     char *buf;
     OpenFile *fptr;
 
@@ -283,7 +284,7 @@ bsock_getsockname(sock)
    VALUE sock;
 {
     char buf[1024];
-    int len = sizeof buf;
+    socklen_t len = sizeof buf;
     OpenFile *fptr;
 
     GetOpenFile(sock, fptr);
@@ -297,7 +298,7 @@ bsock_getpeername(sock)
    VALUE sock;
 {
     char buf[1024];
-    int len = sizeof buf;
+    socklen_t len = sizeof buf;
     OpenFile *fptr;
 
     GetOpenFile(sock, fptr);
@@ -377,9 +378,9 @@ s_recv(sock, argc, argv, from)
     OpenFile *fptr;
     VALUE str;
     char buf[1024];
-    int fd, alen = sizeof buf;
+    socklen_t alen = sizeof buf;
     VALUE len, flg;
-    int flags;
+    int fd, flags;
 
     rb_scan_args(argc, argv, "11", &len, &flg);
 
@@ -960,7 +961,7 @@ s_accept(class, fd, sockaddr, len)
     VALUE class;
     int fd;
     struct sockaddr *sockaddr;
-    int *len;
+    socklen_t *len;
 {
     int fd2;
 
@@ -993,7 +994,7 @@ tcp_accept(sock)
 {
     OpenFile *fptr;
     struct sockaddr_storage from;
-    int fromlen;
+    socklen_t fromlen;
 
     GetOpenFile(sock, fptr);
     fromlen = sizeof(from);
@@ -1065,7 +1066,7 @@ ip_addr(sock)
 {
     OpenFile *fptr;
     struct sockaddr_storage addr;
-    int len = sizeof addr;
+    socklen_t len = sizeof addr;
 
     GetOpenFile(sock, fptr);
 
@@ -1080,7 +1081,7 @@ ip_peeraddr(sock)
 {
     OpenFile *fptr;
     struct sockaddr_storage addr;
-    int len = sizeof addr;
+    socklen_t len = sizeof addr;
 
     GetOpenFile(sock, fptr);
 
@@ -1239,7 +1240,7 @@ unix_path(sock)
     GetOpenFile(sock, fptr);
     if (fptr->path == 0) {
 	struct sockaddr_un addr;
-	int len = sizeof(addr);
+	socklen_t len = sizeof(addr);
 	if (getsockname(fileno(fptr->f), (struct sockaddr*)&addr, &len) < 0)
 	    rb_sys_fail(0);
 	fptr->path = strdup(addr.sun_path);
@@ -1269,7 +1270,7 @@ unix_accept(sock)
 {
     OpenFile *fptr;
     struct sockaddr_un from;
-    int fromlen;
+    socklen_t fromlen;
 
     GetOpenFile(sock, fptr);
     fromlen = sizeof(struct sockaddr_un);
@@ -1290,7 +1291,7 @@ unix_addr(sock)
 {
     OpenFile *fptr;
     struct sockaddr_un addr;
-    int len = sizeof addr;
+    socklen_t len = sizeof addr;
 
     GetOpenFile(sock, fptr);
 
@@ -1305,7 +1306,7 @@ unix_peeraddr(sock)
 {
     OpenFile *fptr;
     struct sockaddr_un addr;
-    int len = sizeof addr;
+    socklen_t len = sizeof addr;
 
     GetOpenFile(sock, fptr);
 
@@ -1508,7 +1509,7 @@ sock_accept(sock)
     OpenFile *fptr;
     VALUE sock2;
     char buf[1024];
-    int len = sizeof buf;
+    socklen_t len = sizeof buf;
 
     GetOpenFile(sock, fptr);
     sock2 = s_accept(rb_cSocket,fileno(fptr->f),(struct sockaddr*)buf,&len);
diff --git a/ext/tk/lib/tktext.rb b/ext/tk/lib/tktext.rb
index e1939af5fe..2b5fb9138e 100644
--- a/ext/tk/lib/tktext.rb
+++ b/ext/tk/lib/tktext.rb
@@ -428,15 +428,9 @@ class TkText<TkTextWin
     rsearch_with_length(pat,start,stop)[0]
   end
 
-  def dump(type_info, *index)
-    args = type_info.collect{|inf|
-                 if inf.kind_of? Array
-                   inf[0] = '-' + inf[0]
-                   inf
-                 else
-                   '-' + inf
-                 end
-               }.flatten
+  def dump(type_info, *index, &block)
+    args = type_info.collect{|inf| '-' + inf}
+    args << '-command' << Proc.new(&block) if iterator?
     str = tk_send('dump', *(args + index))
     result = []
     sel = nil
@@ -546,26 +540,23 @@ class TkText<TkTextWin
   end
   private :_retrieve_backslashed_text
 
-  def dump_all(*index)
-    dump(['all'], *index)
+  def dump_all(*index, &block)
+    dump(['all'], *index, &block)
   end
-  def dump_command(cmd, *index)
-    dump([['command', cmd]], *index)
+  def dump_mark(*index, &block)
+    dump(['mark'], *index, &block)
   end
-  def dump_mark(*index)
-    dump(['mark'], *index)
+  def dump_tag(*index, &block)
+    dump(['tag'], *index, &block)
   end
-  def dump_tag(*index)
-    dump(['tag'], *index)
+  def dump_text(*index, &block)
+    dump(['text'], *index, &block)
   end
-  def dump_text(*index)
-    dump(['text'], *index)
+  def dump_window(*index, &block)
+    dump(['window'], *index, &block)
   end
-  def dump_window(*index)
-    dump(['window'], *index)
-  end
-  def dump_image(*index)
-    dump(['image'], *index)
+  def dump_image(*index, &block)
+    dump(['image'], *index, &block)
   end
 end