natPlainDatagramSocketImpl.cc (close): New function.

	* java/net/natPlainDatagramSocketImpl.cc (close): New function.
	* java/net/natPlainSocketImpl.cc (close): Indentation fix.

From-SVN: r51563

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index fb9476da9cbeb096726d5f726f65106c43b92f47..8a79daac60c519f2c080d23f3d50098dfae37222 100644 (file)
--- 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 071d3679e518ca373fa33005709cd6e486af1ffb..e43102a1661d682c7f402e553458d92c41190b3b 100644 (file)
--- 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 85f831332b8ad2d928ba51e88b838cbe55fc782b..2ea46e6163b21ccce9031ed9563474be7d09614b 100644 (file)
--- 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);
 }