diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/include/posix.h | 7 | ||||
| -rw-r--r-- | libjava/include/win32.h | 8 |
3 files changed, 19 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 5a6950725ee..5cb290b2465 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 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, java/nio/channels/CancelledKeyException.java, java/nio/channels/ClosedByInterruptException.java, diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 975b93c56f4..3350f4f04b0 100644 --- 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 3965cb2575f..a1a8fc159f8 100644 --- 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__ */ |
