Merge "Import upstream change: Windows networking code prevents use of -Xlint:auxiliaryclass in jdk build"
diff --git a/ojluni/src/main/java/java/net/AbstractPlainSocketImpl.java b/ojluni/src/main/java/java/net/AbstractPlainSocketImpl.java
index 746c19e..330e014 100755
--- a/ojluni/src/main/java/java/net/AbstractPlainSocketImpl.java
+++ b/ojluni/src/main/java/java/net/AbstractPlainSocketImpl.java
@@ -647,7 +647,3 @@
public final static int SHUT_RD = 0;
public final static int SHUT_WR = 1;
}
-
-class InetAddressContainer {
- InetAddress addr;
-}
diff --git a/ojluni/src/main/java/java/net/InetAddressContainer.java b/ojluni/src/main/java/java/net/InetAddressContainer.java
new file mode 100644
index 0000000..28b6402
--- /dev/null
+++ b/ojluni/src/main/java/java/net/InetAddressContainer.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.net;
+
+class InetAddressContainer {
+ InetAddress addr;
+}
diff --git a/openjdk_java_files.mk b/openjdk_java_files.mk
index 07af2aa..29bdd09 100644
--- a/openjdk_java_files.mk
+++ b/openjdk_java_files.mk
@@ -262,6 +262,7 @@
ojluni/src/main/java/java/net/Inet4Address.java \
ojluni/src/main/java/java/net/Inet6AddressImpl.java \
ojluni/src/main/java/java/net/Inet6Address.java \
+ ojluni/src/main/java/java/net/InetAddressContainer.java \
ojluni/src/main/java/java/net/InetAddressImpl.java \
ojluni/src/main/java/java/net/InetAddress.java \
ojluni/src/main/java/java/net/InetSocketAddress.java \