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

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 9ed4b4c3a16c2a87ef82c428d9d34cd1e723431c..4eeed878155724e641c6009c19cdc59ec7183539 100644 (file)
--- 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 28018a39c1cbed74075def7d3bd3b2ab3a9a670f..a8a726ecf80a6f7510286bdbffbe5d26f4eabfd1 100644 (file)
--- 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 2015fe1eb96817321896edb5e1336b029d110c85..ef3c4431acba3c25784360276dc2876b911f3c48 100644 (file)
--- 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;