diff options
| author | Bryce McKinlay <bryce@mckinlay.net.nz> | 2003-09-24 05:38:36 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2003-09-24 06:38:36 +0100 |
| commit | 9b7fe786e1287f830952706fbd9ddb39077d70a9 (patch) | |
| tree | e590f9d618533504ebc1020d0b891654538a1dff /libjava/Makefile.in | |
| parent | b9f2972f1ea065c2ceb8bc0d1cab7636dc2406ae (diff) | |
| download | gcc-9b7fe786e1287f830952706fbd9ddb39077d70a9.tar.gz gcc-9b7fe786e1287f830952706fbd9ddb39077d70a9.tar.bz2 gcc-9b7fe786e1287f830952706fbd9ddb39077d70a9.zip | |
PlainSocketImpl.java (read): Remove declaration.
* gnu/java/net/PlainSocketImpl.java (read): Remove declaration.
(write): Likewise.
(SocketInputStream, SocketOutputStream): Declare `read' and `write'
native. Remove implementations which called back into
PlainSocketImpl.
Remove unneccessary overridden methods.
* gnu/java/net/natPlainSocketImplNoNet.cc (read): Move
implementation
to inner class PlainSocketImpl.SocketInputStream.
(write): Likewise.
* gnu/java/net/natPlainSocketImplPosix.cc: As above.
* gnu/java/net/natPlainSocketImplWin32.cc: As above.
* gnu/java/net/SocketInputStream.java: Remove unused file.
* gnu/java/net/SocketOutputStream.java: Likewise.
* Makefile.am: Build CNI headers for PlainSocketImpl.SocketInputStream
and SocketOutputStream.
* Makefile.in: Rebuilt.
From-SVN: r71724
Diffstat (limited to 'libjava/Makefile.in')
| -rw-r--r-- | libjava/Makefile.in | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libjava/Makefile.in b/libjava/Makefile.in index b4ff7aca48e..b6a5fbd2ae5 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -444,8 +444,9 @@ ordinary_nat_headers = $(ordinary_java_source_files:.java=.h) \ inner_nat_headers = java/io/ObjectOutputStream$$PutField.h \ java/io/ObjectInputStream$$GetField.h \ java/lang/reflect/Proxy$$ProxyData.h \ - java/lang/reflect/Proxy$$ProxyType.h - + java/lang/reflect/Proxy$$ProxyType.h \ + gnu/java/net/PlainSocketImpl$$SocketInputStream.h \ + gnu/java/net/PlainSocketImpl$$SocketOutputStream.h nat_headers = $(ordinary_nat_headers) $(inner_nat_headers) @@ -5047,6 +5048,14 @@ java/io/ObjectOutputStream$$PutField.h: java/io/ObjectOutputStream.class $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ 'java/io/ObjectOutputStream$$PutField' +gnu/java/net/PlainSocketImpl$$SocketInputStream.h: gnu/java/net/PlainSocketImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/net/PlainSocketImpl$$SocketInputStream' + +gnu/java/net/PlainSocketImpl$$SocketOutputStream.h: gnu/java/net/PlainSocketImpl.class + $(GCJH) -classpath '' -bootclasspath $(top_builddir) \ + 'gnu/java/net/PlainSocketImpl$$SocketOutputStream' + $(extra_headers) $(srcdir)/java/lang/Object.h $(srcdir)/java/lang/Class.h: @: |