diff options
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/include/posix.h | 4 | ||||
| -rw-r--r-- | libjava/java/net/natPlainDatagramSocketImpl.cc | 3 | ||||
| -rw-r--r-- | libjava/java/net/natPlainSocketImpl.cc | 3 |
4 files changed, 11 insertions, 6 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index be17304..0805e31 100644 --- 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 447cada..4bb1d56 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 cbc029a..5546061 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 9cd0f3b..114c210 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 <bstring.h> #endif -#ifndef HAVE_SOCKLEN_T -typedef int socklen_t; -#endif #include <gcj/cni.h> #include <gcj/javaprims.h> |