From 1c7897c9ef38ed285ea4cc34304a121186623027 Mon Sep 17 00:00:00 2001 From: mkoch Date: Thu, 21 Nov 2002 18:01:22 +0000 Subject: [PATCH] 2002-11-21 Michael Koch * include/posix.h: I put too much into the #ifndef DISABLE_JAVA_NET. Only the new network functions should be in it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59350 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 7 ++++++- libjava/include/posix.h | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5cb290b..f000e17 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,6 +1,11 @@ 2002-11-21 Michael Koch - * include/posic.h: Moved new functions into a #ifndef DISABLE_JAVA_NET + * include/posix.h: I put too much into the #ifndef DISABLE_JAVA_NET. + Only the new network functions should be in it. + +2002-11-21 Michael Koch + + * include/posix.h: Moved new functions into a #ifndef DISABLE_JAVA_NET * include/win32.h: Moved new functions into a #ifndef DISABLE_JAVA_NET 2002-11-21 Michael Koch diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 3350f4f..521b16f 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -11,8 +11,6 @@ details. */ #ifndef __JV_POSIX_H__ #define __JV_POSIX_H__ -#ifndef DISABLE_JAVA_NET - /* Required on Tru64 UNIX V4/V5 so defines prototypes of socket functions with socklen_t instead of size_t. This must be defined early so defines the correct version of __PIIX. */ @@ -42,11 +40,17 @@ details. */ #include #include +#ifndef DISABLE_JAVA_NET +#include +#endif + extern int _Jv_select (int n, fd_set *, fd_set *, fd_set *, struct timeval *); extern jlong _Jv_platform_gettimeofday (); extern void _Jv_platform_initialize (void); extern void _Jv_platform_initProperties (java::util::Properties*); +#ifndef DISABLE_JAVA_NET + static inline int _Jv_socket (int domain, int type, int protocol) { -- 2.7.4