diff options
| author | Gary Benson <gbenson@redhat.com> | 2006-11-03 10:16:30 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2006-11-03 10:16:30 +0000 |
| commit | 54f9963a2063e02aa8fa254bf2fce7f35acbb393 (patch) | |
| tree | 9dc298067d0069950f065a4236f29aab615da273 | |
| parent | adefdaca2d8aa874f3e1f5b8be2736355292b6a4 (diff) | |
| download | gcc-54f9963a2063e02aa8fa254bf2fce7f35acbb393.zip gcc-54f9963a2063e02aa8fa254bf2fce7f35acbb393.tar.gz gcc-54f9963a2063e02aa8fa254bf2fce7f35acbb393.tar.bz2 | |
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.
From-SVN: r118452
| -rw-r--r-- | libjava/classpath/ChangeLog.gcj | 9 | ||||
| -rw-r--r-- | libjava/classpath/java/net/Inet4Address.java | 6 | ||||
| -rw-r--r-- | libjava/classpath/java/net/Inet6Address.java | 4 |
3 files changed, 14 insertions, 5 deletions
diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index 9ed4b4c3..4eeed87 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,3 +1,12 @@ +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. + 2006-10-10 Tom Tromey <tromey@redhat.com> PR classpath/29362: diff --git a/libjava/classpath/java/net/Inet4Address.java b/libjava/classpath/java/net/Inet4Address.java index 28018a3..a8a726e 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 2015fe1..ef3c443 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; |