diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 08ed381140306ef9f0516906fd3858b7ed96abbd..5cbdaeb782a6e9d2d22ffa4a57d6a5f516a873a6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2002-03-08 Adam Megacz <adam@xwt.org> + + * java/net/natPlainSocketImpl.cc (read, write, close): Formatting + fixed. + 2002-03-09 Bryce McKinlay <bryce@waitaki.otago.ac.nz> * posix.cc (_Jv_platform_gettimeofday): Make sure result doesn't get diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc index 7090fcd64a40940f02ee47ac5c45ede0dbf2d4df..99eb80b370e09d5b9666ee282d07ddb68f59a2dd 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -20,17 +20,20 @@ details. */ #undef MIN_PRIORITY #undef FIONREAD -// stuff to make Win32 look POSIXy -static inline int close(int s) { +// These functions make the Win32 socket API look more POSIXy +static inline int +close(int s) { return closesocket(s); } -static inline int write(int s, void *buf, int len) +static inline int +write(int s, void *buf, int len) { return send(s, (char*)buf, len, 0); } -static inline int read(int s, void *buf, int len) +static inline int +read(int s, void *buf, int len) { return recv(s, (char*)buf, len, 0); }