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 + + * java/net/natPlainDatagramSocketImpl.cc (close): New function. + * java/net/natPlainSocketImpl.cc (close): Indentation fix. + 2002-03-27 Jeff Sturm * 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 -#include +#include #ifdef WIN32 #include @@ -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 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); }