gw32 b19 patch

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

4 files changed, 4 insertions, 4 deletions

diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 20cd9295ed..203df635c1 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -123,7 +123,7 @@ static VALUE
 etc_passwd(obj)
     VALUE obj;
 {
-#if defined(HAVE_GETPWENT) && !defined(__CYGWIN32__)
+#if defined(HAVE_GETPWENT)
     struct passwd *pw;
 
     if (iterator_p()) {
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index f8f69973e9..9c6f3f50e2 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -471,7 +471,7 @@ else
   Dir.chdir ".."
   if older("ruby@binsuffix@", "miniruby@binsuffix@")
     `rm -f ruby@binsuffix@`
-    `cp miniruby@binsuffix@ ruby@binsuffix@`
+    system("make ruby@binsuffix@")
   end
 end
 
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index f719723864..bbda95cf83 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -4,7 +4,7 @@ when /mswin32/
   test_func = "WSACleanup"
   have_library("wsock32", "WSACleanup")
 when /cygwin32/
-  test_func = "cygwin32_socket"
+  test_func = "socket"
 else
   test_func = "socket"
   have_library("socket", "socket")
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 1b87ae9146..d45db8b818 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1137,7 +1137,7 @@ static VALUE
 sock_s_socketpair(class, domain, type, protocol)
     VALUE class, domain, type, protocol;
 {
-#if !defined(__CYGWIN32__) && !defined(NT)
+#if !defined(NT)
     int fd;
     int d, t, sp[2];