summaryrefslogtreecommitdiff
path: root/libjava/sources.am
diff options
context:
space:
mode:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2007-02-12 23:52:39 +0000
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>2007-02-12 23:52:39 +0000
commitc3c147306bab7d0e29422e18cc8ab58a031fd4ad (patch)
treee330b8e9a136b5340488dc4c338504cc6b870e5b /libjava/sources.am
parent6321eb6cec78b9c2b185a97afd1fc64c5b92a70a (diff)
downloadgcc-c3c147306bab7d0e29422e18cc8ab58a031fd4ad.tar.gz
libjava/classpath
* java/util/Collections.java (UnmodifiableMap.toArray): Imported changes from Classpath. libjava * sources.am, Makefile.in: Rebuilt. * java/lang/Socket.java: Removed override. * java/lang/DatagramSocket.java: Removed override. * gnu/java/net/PlainSocketImpl.java (localSocketAddress): New field. (getLocalAddress): New method. * gnu/java/net/PlainDatagramSocketImpl.java (PlainDatagramSocketImpl): Throws IOException. * gnu/java/net/natPlainSocketImplPosix.cc (write): Remove 'sizeof'. (read): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121866 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/sources.am')
-rw-r--r--libjava/sources.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/libjava/sources.am b/libjava/sources.am
index e1b2b3776b6..0c9953f33b9 100644
--- a/libjava/sources.am
+++ b/libjava/sources.am
@@ -4905,7 +4905,7 @@ classpath/java/net/ConnectException.java \
classpath/java/net/ContentHandler.java \
classpath/java/net/ContentHandlerFactory.java \
classpath/java/net/DatagramPacket.java \
-java/net/DatagramSocket.java \
+classpath/java/net/DatagramSocket.java \
classpath/java/net/DatagramSocketImpl.java \
classpath/java/net/DatagramSocketImplFactory.java \
classpath/java/net/FileNameMap.java \
@@ -4928,7 +4928,7 @@ classpath/java/net/Proxy.java \
classpath/java/net/ProxySelector.java \
classpath/java/net/ResolverCache.java \
classpath/java/net/ServerSocket.java \
-java/net/Socket.java \
+classpath/java/net/Socket.java \
classpath/java/net/SocketAddress.java \
classpath/java/net/SocketException.java \
classpath/java/net/SocketImpl.java \