From: Michael Koch <konqueror@gmx.de>
Date: Thu, 21 Nov 2002 18:01:22 +0000 (+0000)
Subject: posix.h: I put too much into the #ifndef DISABLE_JAVA_NET.
X-Git-Tag: releases/gcc-3.3.0~1688
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1bf262d83bcc7e834d0319131250005d5af386e;p=thirdparty%2Fgcc.git

posix.h: I put too much into the #ifndef DISABLE_JAVA_NET.

 2002-11-21  Michael Koch <konqueror@gmx.de>

        * include/posix.h: I put too much into the #ifndef DISABLE_JAVA_NET.
        Only the new network functions should be in it.

From-SVN: r59350
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5cb290b24654..f000e1794f21 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,6 +1,11 @@
 2002-11-21  Michael Koch <konqueror@gmx.de>
 
-	* 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 <konqueror@gmx.de>
+
+	* 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 <konqueror@gmx.de>
diff --git a/libjava/include/posix.h b/libjava/include/posix.h
index 3350f4f04b03..521b16fa553d 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 <sys/socket.h> defines prototypes of
    socket functions with socklen_t instead of size_t.  This must be defined
    early so <standards.h> defines the correct version of __PIIX.  */
@@ -42,11 +40,17 @@ details.  */
 #include <gcj/cni.h>
 #include <java/util/Properties.h>
 
+#ifndef DISABLE_JAVA_NET
+#include <java/net/InetAddress.h>
+#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)
 {