natPlainDatagramSocketImpl.cc (socklen_t): Don't define.

2002-11-26  Andreas Tobler  <a.tobler@schweiz.ch>

	* java/net/natPlainDatagramSocketImpl.cc (socklen_t): Don't
	define.
	* java/net/natPlainSocketImpl.cc (socklen_t): Don't define.
	* include/posix.h (socklen_t): Define if not already defined.

From-SVN: r59533

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index be1730430e769280d0ecdd2226146ff715fdd7c4..0805e310393c4db9ca7b570451e7f09e6a4578bd 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-26  Andreas Tobler  <a.tobler@schweiz.ch>
+
+       * java/net/natPlainDatagramSocketImpl.cc (socklen_t): Don't
+       define.
+       * java/net/natPlainSocketImpl.cc (socklen_t): Don't define.
+       * include/posix.h (socklen_t): Define if not already defined.
+
 2002-11-25  Tom Tromey  <tromey@redhat.com>
 
        * verify.cc (type::compatible): Backed out broken change.

diff --git a/libjava/include/posix.h b/libjava/include/posix.h
index 447cadaf790dc0d44030bd60327fbbb6a22726df..4bb1d56810f52c901cad7e8dee01893018c0ca9d 100644 (file)
--- a/libjava/include/posix.h
+++ b/libjava/include/posix.h
@@ -58,6 +58,10 @@ _Jv_platform_close_on_exec (jint fd)
 
 #ifndef DISABLE_JAVA_NET
 
+#ifndef HAVE_SOCKLEN_T
+#define socklen_t int
+#endif
+
 static inline int
 _Jv_socket (int domain, int type, int protocol)
 {

diff --git a/libjava/java/net/natPlainDatagramSocketImpl.cc b/libjava/java/net/natPlainDatagramSocketImpl.cc
index cbc029a18da862e44429c062cb64e0b88a208aae..5546061c503b121599d5cce349c1fcdb42bc59ef 100644 (file)
--- a/libjava/java/net/natPlainDatagramSocketImpl.cc
+++ b/libjava/java/net/natPlainDatagramSocketImpl.cc
@@ -151,9 +151,6 @@ java::net::PlainDatagramSocketImpl::getOption (jint)
 
 #else /* DISABLE_JAVA_NET */
 
-#ifndef HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
 
 union SockAddr
 {

diff --git a/libjava/java/net/natPlainSocketImpl.cc b/libjava/java/net/natPlainSocketImpl.cc
index 9cd0f3b9dff9bafb7070a2733bec1f4a0d683b75..114c2102ac54399f0a9359ed979892b29aef602c 100644 (file)
--- a/libjava/java/net/natPlainSocketImpl.cc
+++ b/libjava/java/net/natPlainSocketImpl.cc
@@ -61,9 +61,6 @@ read(int s, void *buf, int len)
 #include <bstring.h>
 #endif
 
-#ifndef HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
 
 #include <gcj/cni.h>
 #include <gcj/javaprims.h>