updates to previous changeset for windows unixdomainchannels
authormichaelm
Mon, 11 Nov 2019 21:17:51 +0000
branchunixdomainchannels
changeset 59019 dafa6389ed47
parent 59018 6d621f34e24a
child 59030 8555f68967d1
updates to previous changeset for windows
src/java.base/windows/native/libnet/net_util_md.h
src/java.base/windows/native/libnio/ch/Net.c
--- a/src/java.base/windows/native/libnet/net_util_md.h	Mon Nov 11 20:27:27 2019 +0000
+++ b/src/java.base/windows/native/libnet/net_util_md.h	Mon Nov 11 21:17:51 2019 +0000
@@ -57,7 +57,6 @@
     struct sockaddr     sa;
     struct sockaddr_in  sa4;
     struct sockaddr_in6 sa6;
-    struct sockaddr_un  saun;
 } SOCKETADDRESS;
 
 /*
--- a/src/java.base/windows/native/libnio/ch/Net.c	Mon Nov 11 20:27:27 2019 +0000
+++ b/src/java.base/windows/native/libnio/ch/Net.c	Mon Nov 11 21:17:51 2019 +0000
@@ -201,7 +201,7 @@
 
     /* accept connection but ignore ECONNABORTED */
     for (;;) {
-        newfd = (jint)accept(fd, (struct sockaddr_un *)&sa, &sa_len);
+        newfd = (jint)accept(fd, (struct sockaddr *)&sa, &sa_len);
         if (newfd >= 0) {
             break;
         }
@@ -235,7 +235,7 @@
 {
     struct sockaddr_un sa;
     socklen_t sa_len = sizeof(sa);
-    if (getsockname(fdval(env, fdo), (struct sockaddr_un *)&sa, &sa_len) < 0) {
+    if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
         handleSocketError(env, errno);
         return NULL;
     }