diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-24 05:38:36 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-09-24 05:38:36 +0000 |
| commit | 1f1db466fc6d7c5b169d667964bb5b79d2ee2c8d (patch) | |
| tree | e590f9d618533504ebc1020d0b891654538a1dff /libjava/Makefile.am | |
| parent | 04d26b229d3224f7666c8321902c8598ecaf2d42 (diff) | |
| download | ppe42-gcc-1f1db466fc6d7c5b169d667964bb5b79d2ee2c8d.tar.gz ppe42-gcc-1f1db466fc6d7c5b169d667964bb5b79d2ee2c8d.zip | |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71724 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/Makefile.am')
| -rw-r--r-- | libjava/Makefile.am | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libjava/Makefile.am b/libjava/Makefile.am index c30ccb6f9cc..c80c3d7ee28 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -464,7 +464,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) @@ -549,6 +551,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' + ## Headers we maintain by hand and which we want to install. extra_headers = java/lang/Object.h java/lang/Class.h |
