diff options
| author | Tom Tromey <tromey@redhat.com> | 2007-02-12 23:52:39 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-02-12 23:52:39 +0000 |
| commit | 40b86e5f2cf069832e23043992dedb0bf8e0dcd6 (patch) | |
| tree | e330b8e9a136b5340488dc4c338504cc6b870e5b /libjava/sources.am | |
| parent | e8c30b5f9a11fed775dddf8c15706ae251fdd2d5 (diff) | |
| download | gcc-40b86e5f2cf069832e23043992dedb0bf8e0dcd6.tar.gz | |
Collections.java (UnmodifiableMap.toArray): Imported changes from Classpath.
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.
From-SVN: r121866
Diffstat (limited to 'libjava/sources.am')
| -rw-r--r-- | libjava/sources.am | 4 |
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 \ |