posic.h: Moved new functions into a #ifndef DISABLE_JAVA_NET

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

	* include/posic.h: Moved new functions into a #ifndef DISABLE_JAVA_NET
	* include/win32.h: Moved new functions into a #ifndef DISABLE_JAVA_NET

From-SVN: r59346

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5a6950725ee0f6122a5fcf1344870581df11f934..5cb290b24654f81fb53614ece8b6a6e62a0ed6bf 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-21  Michael Koch <konqueror@gmx.de>
+
+       * include/posic.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>
 
        * java/nio/channels/AsynchronousCloseException.java,

diff --git a/libjava/include/posix.h b/libjava/include/posix.h
index 975b93c56f40e576b27c47afe67ec7d2f20a27d2..3350f4f04b03ee4140c501f36d6a5c866a069abb 100644 (file)
--- a/libjava/include/posix.h
+++ b/libjava/include/posix.h
@@ -11,6 +11,8 @@ 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.  */
@@ -102,4 +104,7 @@ _Jv_read(int s, void *buf, int len)
 {
   return ::read (s, buf, len);
 }
-#endif
+
+#endif /* DISABLE_JAVA_NET */
+
+#endif /* __JV_POSIX_H__ */

diff --git a/libjava/include/win32.h b/libjava/include/win32.h
index 3965cb2575ff667d731a76f2411abafa63e5e974..a1a8fc159f8b38cf9574ef28f71e5b59ef471ebe 100644 (file)
--- a/libjava/include/win32.h
+++ b/libjava/include/win32.h
@@ -22,6 +22,8 @@ details.  */
 
 #include <io.h>
 
+#ifndef DISBALE_JAVA_NET
+
 // these errors cannot occur on Win32
 #define ENOTCONN 0
 #define ECONNRESET 0
@@ -30,10 +32,14 @@ details.  */
 #define ENOPROTOOPT 109
 #endif
 
+#endif // DISBALE_JAVA_NET
+
 extern void _Jv_platform_initialize (void);
 extern void _Jv_platform_initProperties (java::util::Properties*);
 extern jlong _Jv_platform_gettimeofday ();
 
+#ifndef DISBALE_JAVA_NET
+
 static inline int
 _Jv_socket (int domain, int type, int protocol)
 {
@@ -93,4 +99,6 @@ _Jv_read(int s, void *buf, int len)
    ARRAY and return the exact number of values stored.  */
 extern int backtrace (void **__array, int __size);
 
+#endif /* DISBALE_JAVA_NET */
+
 #endif /* __JV_WIN32_H__ */