--- a/src/solaris/native/java/net/net_util_md.c	Mon Jul 28 13:02:11 2008 +0100
+++ b/src/solaris/native/java/net/net_util_md.c	Tue Jul 29 09:53:35 2008 -0700
@@ -1085,7 +1085,16 @@ NET_GetSockOpt(int fd, int level, int op
     }
 #endif
 
-    rv = getsockopt(fd, level, opt, result, (socklen_t)len);
+#ifdef __solaris__
+    rv = getsockopt(fd, level, opt, result, len);
+#else
+    {
+        socklen_t socklen = *len;
+        rv = getsockopt(fd, level, opt, result, &socklen);
+        *len = socklen;
+    }
+#endif
+
     if (rv < 0) {
         return rv;
     }