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 5cb290b24654f81fb53614ece8b6a6e62a0ed6bf..f000e1794f210d5b677cdf1432f5042efc47ad98 100644 (file)
--- 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 3350f4f04b03ee4140c501f36d6a5c866a069abb..521b16fa553d7691ee032659934d0932d85d5499 100644 (file)
--- 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)
 {