Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorchegar
Thu, 19 Dec 2013 13:08:05 +0000
changeset 22072 85d59217d316
parent 22071 8e1399f55471 (current diff)
parent 22069 d55e36f6c0c9 (diff)
child 22073 3cac022a1634
Merge
--- a/jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c	Thu Dec 19 10:40:50 2013 +0000
+++ b/jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c	Thu Dec 19 13:08:05 2013 +0000
@@ -41,7 +41,7 @@
     char buf[1];
     fd_set tbl;
     struct timeval t = { 0, 0 };
-    struct sockaddr_in rmtaddr;
+    SOCKETADDRESS rmtaddr;
     int addrlen = sizeof(rmtaddr);
 
     /*
--- a/jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c	Thu Dec 19 10:40:50 2013 +0000
+++ b/jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c	Thu Dec 19 13:08:05 2013 +0000
@@ -332,7 +332,7 @@
     char buf[1];
     fd_set tbl;
     struct timeval t = { 0, 0 };
-    struct sockaddr_in rmtaddr;
+    SOCKETADDRESS rmtaddr;
     int addrlen = sizeof(rmtaddr);
 
     /*
--- a/jdk/test/ProblemList.txt	Thu Dec 19 10:40:50 2013 +0000
+++ b/jdk/test/ProblemList.txt	Thu Dec 19 13:08:05 2013 +0000
@@ -158,10 +158,6 @@
 # Filed 7052625
 com/sun/net/httpserver/bugs/6725892/Test.java                   generic-all
 
-# failing on vista 32/64 on nightly
-# 7102702
-java/net/PortUnreachableException/OneExceptionOnly.java         windows-all
-
 # 7148829
 sun/net/InetAddress/nameservice/simple/CacheTest.java		generic-all
 sun/net/InetAddress/nameservice/simple/DefaultCaching.java	generic-all
jdk-sandbox