Hi all,
This commit renames the constants AF_INET and AF_INET6 that I
introduced in my last commit. Unfortunatly with gcj they end
up in CNI headers where they conflict with the real AF_INET
and AF_INET6.
Cheers,
Gary
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.8521
diff -u -r1.8521 ChangeLog
--- ChangeLog 10 Sep 2006 21:16:39 -0000 1.8521
+++ ChangeLog 11 Sep 2006 10:31:14 -0000
@@ -1,3 +1,12 @@
+2006-09-11 Gary Benson <[EMAIL PROTECTED]>
+
+ * java/net/Inet4Address.java
+ (AF_INET): Renamed to FAMILY.
+ (<init>, writeReplace): Reflect the above.
+ * java/net/Inet6Address.java
+ (AF_INET6): Renamed to FAMILY.
+ (<init>): Reflect the above.
+
2006-09-10 Ito Kazumitsu <[EMAIL PROTECTED]>
Fixes bug #28867
Index: java/net/Inet4Address.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Inet4Address.java,v
retrieving revision 1.21
diff -u -r1.21 Inet4Address.java
--- java/net/Inet4Address.java 8 Sep 2006 14:33:31 -0000 1.21
+++ java/net/Inet4Address.java 11 Sep 2006 10:31:14 -0000
@@ -57,16 +57,16 @@
static final long serialVersionUID = 3286316764910316507L;
/**
- * The address family of these addresses.
+ * The address family of these addresses. Used for serialization.
*/
- private static final int AF_INET = 2;
+ private static final int FAMILY = 2; // AF_INET
/**
* Inet4Address objects are serialized as InetAddress objects.
*/
private Object writeReplace() throws ObjectStreamException
{
- return new InetAddress(addr, hostName, AF_INET);
+ return new InetAddress(addr, hostName, FAMILY);
}
/**
@@ -79,7 +79,7 @@
*/
Inet4Address(byte[] addr, String host)
{
- super(addr, host, AF_INET);
+ super(addr, host, FAMILY);
}
/**
Index: java/net/Inet6Address.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Inet6Address.java,v
retrieving revision 1.14
diff -u -r1.14 Inet6Address.java
--- java/net/Inet6Address.java 8 Sep 2006 14:33:31 -0000 1.14
+++ java/net/Inet6Address.java 11 Sep 2006 10:31:14 -0000
@@ -93,9 +93,9 @@
private transient NetworkInterface nif;
/**
- * The address family of these addresses.
+ * The address family of these addresses. Used for serialization.
*/
- private static final int AF_INET6 = 10;
+ private static final int FAMILY = 10; // AF_INET6
/**
* Create an Inet6Address object
@@ -105,7 +105,7 @@
*/
Inet6Address(byte[] addr, String host)
{
- super(addr, host, AF_INET6);
+ super(addr, host, FAMILY);
// Super constructor clones the addr. Get a reference to the clone.
this.ipaddress = this.addr;
ifname = null;
