From fe72d8be62e78508d44a1508c80b242b8c9dcdc4 Mon Sep 17 00:00:00 2001
From: gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 3 Nov 2006 10:16:30 +0000
Subject: [PATCH] 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
---
libjava/classpath/ChangeLog.gcj | 9 +++++++++
libjava/classpath/java/net/Inet4Address.java | 6 +++---
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 9ed4b4c3a16c..4eeed8781557 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 28018a39c1cb..a8a726ecf80a 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 2015fe1eb968..ef3c4431acba 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;
--
GitLab