--- a/jdk/src/share/transport/socket/socketTransport.c	Thu Jan 17 15:09:46 2013 -0500
+++ b/jdk/src/share/transport/socket/socketTransport.c	Fri Jan 18 17:34:40 2013 +0000
@@ -304,7 +304,7 @@
 
     {
         char buf[20];
-        int len = sizeof(sa);
+        socklen_t len = sizeof(sa);
         jint portNum;
         err = dbgsysGetSocketName(serverSocketFD,
                                (struct sockaddr *)&sa, &len);
@@ -324,7 +324,8 @@
 static jdwpTransportError JNICALL
 socketTransport_accept(jdwpTransportEnv* env, jlong acceptTimeout, jlong handshakeTimeout)
 {
-    int socketLen, err;
+    socklen_t socketLen;
+    int err;
     struct sockaddr_in socket;
     jlong startTime = (jlong)0;
 
@@ -508,7 +509,7 @@
     if (dbgsysSocketClose(fd) < 0) {
         /*
          * close failed - it's pointless to restore socketFD here because
-         * any subsequent close will likely fail aswell.
+         * any subsequent close will likely fail as well.
          */
         RETURN_IO_ERROR("close failed");
     }