diff --git a/ChangeLog b/ChangeLog
index ed6e0c04c3..3ee1829afb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 27 01:30:59 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* ext/socket/socket.c (ruby_connect): on win32, type of the 4th
+	  argument of getsockopt is char *.
+
 Fri Sep 26 18:35:40 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/resolv-replace.rb: 1.8 compliance.  [ruby-talk:82946]
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 2130d5f53c..ca2528f549 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -790,7 +790,7 @@ ruby_connect(fd, sockaddr, len, socks)
 #endif
 #if WAIT_IN_PROGRESS > 0
 		sockerrlen = sizeof(sockerr);
-		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, &sockerr, &sockerrlen);
+		status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
 		if (status) break;
 		if (sockerr) {
 		    status = -1;
@@ -816,7 +816,7 @@ ruby_connect(fd, sockaddr, len, socks)
 		     * status.
 		     */
 		    sockerrlen = sizeof(sockerr);
-		    status = getsockopt(fd, SOL_SOCKET, SO_ERROR, &sockerr, &sockerrlen);
+		    status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
 		    if (!status && !sockerr) {
 			struct timeval tv = {0, 100000};
 			rb_thread_wait_for(tv);