diff options
author | glewis <glewis@FreeBSD.org> | 2005-12-03 06:17:15 +0800 |
---|---|---|
committer | glewis <glewis@FreeBSD.org> | 2005-12-03 06:17:15 +0800 |
commit | 5c6d3b09f1e593bc190049307024da422d93416c (patch) | |
tree | 139f603af80d77acb817e3fe4217fa8be614441d /java | |
parent | 59f29abc40c645ba8da3aed79e20be0ce0493d2e (diff) | |
download | freebsd-ports-gnome-5c6d3b09f1e593bc190049307024da422d93416c.tar.gz freebsd-ports-gnome-5c6d3b09f1e593bc190049307024da422d93416c.tar.zst freebsd-ports-gnome-5c6d3b09f1e593bc190049307024da422d93416c.zip |
. The patch to use getaddrinfo() #ifdef'ed out too much code. Change that
to isReachable() is still available (fixes some JCK tests).
Submitted by: Christos Zoulas
Diffstat (limited to 'java')
-rw-r--r-- | java/jdk15/files/patch-j2se::net::Inet4AddressImpl.c | 25 | ||||
-rw-r--r-- | java/jdk16/files/patch-j2se::net::Inet4AddressImpl.c | 25 |
2 files changed, 50 insertions, 0 deletions
diff --git a/java/jdk15/files/patch-j2se::net::Inet4AddressImpl.c b/java/jdk15/files/patch-j2se::net::Inet4AddressImpl.c new file mode 100644 index 000000000000..8cd624f127ad --- /dev/null +++ b/java/jdk15/files/patch-j2se::net::Inet4AddressImpl.c @@ -0,0 +1,25 @@ +--- ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c 10 Aug 2005 16:51:14 -0000 1.8 ++++ ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c 21 Sep 2005 02:27:28 -0000 1.9 +@@ -608,6 +608,8 @@ + return ret; + } + ++#endif /* USE_GETADDRINFO */ ++ + #define SET_NONBLOCKING(fd) { \ + int flags = fcntl(fd, F_GETFL); \ + flags |= O_NONBLOCK; \ +@@ -860,6 +862,7 @@ + } + } + ++#ifndef USE_GETADDRINFO + #if defined(_ALLBSD_SOURCE) + + #if defined(LIBC_SCCS) && !defined(lint) +@@ -1069,4 +1072,4 @@ + #endif /* !defined(_REENTRANT) || !defined(DO_PTHREADS) */ + + #endif +-#endif /* USE_GETADDRINFO */ ++#endif /* !USE_GETADDRINFO */ diff --git a/java/jdk16/files/patch-j2se::net::Inet4AddressImpl.c b/java/jdk16/files/patch-j2se::net::Inet4AddressImpl.c new file mode 100644 index 000000000000..8cd624f127ad --- /dev/null +++ b/java/jdk16/files/patch-j2se::net::Inet4AddressImpl.c @@ -0,0 +1,25 @@ +--- ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c 10 Aug 2005 16:51:14 -0000 1.8 ++++ ../../j2se/src/solaris/native/java/net/Inet4AddressImpl.c 21 Sep 2005 02:27:28 -0000 1.9 +@@ -608,6 +608,8 @@ + return ret; + } + ++#endif /* USE_GETADDRINFO */ ++ + #define SET_NONBLOCKING(fd) { \ + int flags = fcntl(fd, F_GETFL); \ + flags |= O_NONBLOCK; \ +@@ -860,6 +862,7 @@ + } + } + ++#ifndef USE_GETADDRINFO + #if defined(_ALLBSD_SOURCE) + + #if defined(LIBC_SCCS) && !defined(lint) +@@ -1069,4 +1072,4 @@ + #endif /* !defined(_REENTRANT) || !defined(DO_PTHREADS) */ + + #endif +-#endif /* USE_GETADDRINFO */ ++#endif /* !USE_GETADDRINFO */ |