diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-29 17:07:59 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-29 17:07:59 +0000 |
| commit | 1dde96053466cfc4dc54943b60f8bd0f7e5f6bce (patch) | |
| tree | 8aa3d82e8f6eba62b20013f8d4ba20e88fca5538 | |
| parent | 5c3d17117abfc216b7fe7aca105baef67bd5a3ef (diff) | |
| download | ppe42-gcc-1dde96053466cfc4dc54943b60f8bd0f7e5f6bce.tar.gz ppe42-gcc-1dde96053466cfc4dc54943b60f8bd0f7e5f6bce.zip | |
* java/net/natPlainDatagramSocketImpl.cc (close): New function.
* java/net/natPlainSocketImpl.cc (close): Indentation fix.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51563 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/net/natPlainDatagramSocketImpl.cc | 9 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 3 |
3 files changed, 15 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fb9476da9cb..8a79daac60c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-03-29 Tom Tromey <tromey@redhat.com> + + * java/net/natPlainDatagramSocketImpl.cc (close): New function. + * java/net/natPlainSocketImpl.cc (close): Indentation fix. + 2002-03-27 Jeff Sturm <jsturm@one-point.com> * java/net/PlainDatagramSocketImpl.java diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc index 071d3679e51..e43102a1661 100644 --- a/libjava/java/net/natPlainDatagramSocketImpl.cc +++ b/libjava/java/net/natPlainDatagramSocketImpl.cc @@ -8,7 +8,7 @@ details. */ #include <config.h> -#include<platform.h> +#include <platform.h> #ifdef WIN32 #include <errno.h> @@ -16,6 +16,13 @@ details. */ #ifndef ENOPROTOOPT #define ENOPROTOOPT 109 #endif + +static inline int +close(int s) +{ + return closesocket(s); +} + #else /* WIN32 */ #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index 85f831332b8..2ea46e6163b 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -22,7 +22,8 @@ details. */ // These functions make the Win32 socket API look more POSIXy static inline int -close(int s) { +close(int s) +{ return closesocket(s); } |
