From 32e098dd9899200f63a8944371038846fdb49915 Mon Sep 17 00:00:00 2001 From: Andreas Tobler Date: Tue, 26 Nov 2002 21:09:28 +0100 Subject: [PATCH] natPlainDatagramSocketImpl.cc (socklen_t): Don't define. 2002-11-26 Andreas Tobler * 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 --- libjava/ChangeLog | 7 +++++++ libjava/include/posix.h | 4 ++++ libjava/java/net/natPlainDatagramSocketImpl.cc | 3 --- libjava/java/net/natPlainSocketImpl.cc | 3 --- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index be1730430e7..0805e310393 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2002-11-26 Andreas Tobler + + * 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 * verify.cc (type::compatible): Backed out broken change. diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 447cadaf790..4bb1d56810f 100644 --- 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 cbc029a18da..5546061c503 100644 --- 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 9cd0f3b9dff..114c2102ac5 100644 --- a/libjava/java/net/natPlainSocketImpl.cc +++ b/libjava/java/net/natPlainSocketImpl.cc @@ -61,9 +61,6 @@ read(int s, void *buf, int len) #include #endif -#ifndef HAVE_SOCKLEN_T -typedef int socklen_t; -#endif #include #include -- 2.30.2