diff options
author | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-11-03 10:16:30 +0000 |
---|---|---|
committer | gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-11-03 10:16:30 +0000 |
commit | fe72d8be62e78508d44a1508c80b242b8c9dcdc4 (patch) | |
tree | 9dc298067d0069950f065a4236f29aab615da273 /libjava/classpath/java | |
parent | cf9498a89fd346d3e9989cb6480ebc495ef40345 (diff) | |
download | gcc-fe72d8be62e78508d44a1508c80b242b8c9dcdc4.tar.gz |
2006-11-03 Gary Benson <gbenson@redhat.com>
* java/net/Inet4Address.java
(FAMILY): Renamed to AF_INET.
(<init>, writeReplace): Reflect the above.
* java/net/Inet6Address.java
(FAMILY): Renamed to AF_INET6.
(<init>): Reflect the above.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@118452 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/java')
-rw-r--r-- | libjava/classpath/java/net/Inet4Address.java | 6 | ||||
-rw-r--r-- | libjava/classpath/java/net/Inet6Address.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libjava/classpath/java/net/Inet4Address.java b/libjava/classpath/java/net/Inet4Address.java index 28018a39c1c..a8a726ecf80 100644 --- a/libjava/classpath/java/net/Inet4Address.java +++ b/libjava/classpath/java/net/Inet4Address.java @@ -59,14 +59,14 @@ public final class Inet4Address extends InetAddress /** * The address family of these addresses (used for serialization). */ - private static final int FAMILY = 2; // AF_INET + private static final int AF_INET = 2; /** * Inet4Address objects are serialized as InetAddress objects. */ private Object writeReplace() throws ObjectStreamException { - return new InetAddress(addr, hostName, FAMILY); + return new InetAddress(addr, hostName, AF_INET); } /** @@ -79,7 +79,7 @@ public final class Inet4Address extends InetAddress */ Inet4Address(byte[] addr, String host) { - super(addr, host, FAMILY); + super(addr, host, AF_INET); } /** diff --git a/libjava/classpath/java/net/Inet6Address.java b/libjava/classpath/java/net/Inet6Address.java index 2015fe1eb96..ef3c4431acb 100644 --- a/libjava/classpath/java/net/Inet6Address.java +++ b/libjava/classpath/java/net/Inet6Address.java @@ -95,7 +95,7 @@ public final class Inet6Address extends InetAddress /** * The address family of these addresses (used for serialization). */ - private static final int FAMILY = 10; // AF_INET6 + private static final int AF_INET6 = 10; /** * Create an Inet6Address object @@ -105,7 +105,7 @@ public final class Inet6Address extends InetAddress */ Inet6Address(byte[] addr, String host) { - super(addr, host, FAMILY); + super(addr, host, AF_INET6); // Super constructor clones the addr. Get a reference to the clone. this.ipaddress = this.addr; ifname = null; |