From: WATANABE Hirofumi <watanabe@...>
Date: 1997-01-28T18:34:15+09:00
Subject: [ruby-list:1920] Re: ruby-1.0-960124 available

わたなべです.

パッチです.

GNU Win32 は <sys/socket.h> で
#define socket cygwin32_socket
なんてことしてるので, しかたなくこうしました.

＃socket は動いたけど make test が通らないから, またパッチお
＃送ることになるかもしれない.

-- 
わたなべひろふみ

diff -ur ../ruby-1.0-970124/top.sed ./top.sed
--- ../ruby-1.0-970124/top.sed	Wed Dec 25 15:14:42 1996
+++ ./top.sed	Fri Jan 24 22:40:44 1997
@@ -18,9 +18,11 @@
 s/@exec_prefix@/${prefix}/
 s/@STRIP@/strip/
 s!/bin/rm!rm!
-s/@LDEXT@/so/
+s/@DLEXT@/o/
 s/@CCDLFLAGS@/-fpic/
-s!@arclib@!/usr/local/lib/ruby/i386-msdos!
+s/@DLDFLAGS@//
+s/@LDSHARED@//
+s!@archlib@!/usr/local/lib/ruby/i386-djgpp!
 /\/dev\/null/s,/dev/null 2>&1, nul,
 /if older/s/"ruby"/"ruby.exe"/g
 /`rm -f ruby`/s//`rm -f ruby.exe`/
diff -ur ../ruby-1.0-970124/ext/extmk.rb.in ./ext/extmk.rb.in
--- ../ruby-1.0-970124/ext/extmk.rb.in	Thu Jan 23 14:18:31 1997
+++ ./ext/extmk.rb.in	Tue Jan 28 09:29:10 1997
@@ -202,7 +202,7 @@
 CC = @CC@
 
 CFLAGS = %s -I../.. @CFLAGS@ #$CFLAGS %s
-LDFLAGS =  @STATIC $(CFLAGS) @LDFLAGS@ #$LDFLAGS
+LDFLAGS =  @STATIC@ @LDFLAGS@ #$LDFLAGS
 DLDFLAGS = @DLDFLAGS@
 LDSHARED = @LDSHARED@
 ", if $static then "" else "@CCDLFLAGS@" end, $defs.join(" ")
diff -ur ../ruby-1.0-970124/ext/socket/extconf.rb ./ext/socket/extconf.rb
--- ../ruby-1.0-970124/ext/socket/extconf.rb	Fri Nov  1 21:06:03 1996
+++ ./ext/socket/extconf.rb	Sun Jan 26 18:43:48 1997
@@ -1,8 +1,8 @@
-have_library("socket", "socket")
+have_library("wsock32", "cygwin32_socket") or have_library("socket", "socket")
 have_library("inet", "gethostbyname")
 have_library("nsl", "gethostbyname")
 have_header("sys/un.h")
-if have_func("socket")
+if have_func("socket") or have_func("cygwin32_socket")
   have_func("hsterror")
   unless have_func("gethostname")
     have_func("uname")
diff -ur ../ruby-1.0-970124/ext/socket/socket.c ./ext/socket/socket.c
--- ../ruby-1.0-970124/ext/socket/socket.c	Thu Jan 23 16:47:20 1997
+++ ./ext/socket/socket.c	Sun Jan 26 18:49:06 1997
@@ -219,6 +219,7 @@
 	status = connect(fd, sockaddr, len);
 	if (status < 0) {
 	    switch (errno) {
+#ifdef EINPROGRESS
 	      case EINPROGRESS:
 #ifdef EAGAIN
 	      case EAGAIN:
@@ -227,10 +228,17 @@
 		FD_SET(fd, &fds);
 		thread_select(fd+1, 0, &fds, 0, 0, 0);
 		continue;
+#endif
 
+#ifdef EISCONN
 	      case EISCONN:
+#endif
+#ifdef EALREADY
 	      case EALREADY:
+#endif
+#if defined(EISCONN) || defined(EALREADY)
 		break;
+#endif
 
 	      default:
 		return status;
diff -ur ../ruby-1.0-970124/util.c ./util.c
--- ../ruby-1.0-970124/util.c	Mon Jan 20 15:21:52 1997
+++ ./util.c	Tue Jan 28 09:29:09 1997
@@ -215,7 +215,7 @@
     // It doesn't exist, so see if we can open it.
     */
     
-    if ((fd = _open(s, _O_CREAT, 0666)) >= 0) {
+    if ((fd = _open(s, O_CREAT, 0666)) >= 0) {
 	_close(fd);
 	_unlink (s);	/* don't leave it laying around */
 	return 1;