Commit e59ff7e9 by Michael Koch Committed by Michael Koch

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
parent 7c143ed2
2002-11-21 Michael Koch <konqueror@gmx.de> 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/AsynchronousCloseException.java,
java/nio/channels/CancelledKeyException.java, java/nio/channels/CancelledKeyException.java,
java/nio/channels/ClosedByInterruptException.java, java/nio/channels/ClosedByInterruptException.java,
......
...@@ -11,6 +11,8 @@ details. */ ...@@ -11,6 +11,8 @@ details. */
#ifndef __JV_POSIX_H__ #ifndef __JV_POSIX_H__
#define __JV_POSIX_H__ #define __JV_POSIX_H__
#ifndef DISABLE_JAVA_NET
/* Required on Tru64 UNIX V4/V5 so <sys/socket.h> defines prototypes of /* 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 socket functions with socklen_t instead of size_t. This must be defined
early so <standards.h> defines the correct version of __PIIX. */ early so <standards.h> defines the correct version of __PIIX. */
...@@ -102,4 +104,7 @@ _Jv_read(int s, void *buf, int len) ...@@ -102,4 +104,7 @@ _Jv_read(int s, void *buf, int len)
{ {
return ::read (s, buf, len); return ::read (s, buf, len);
} }
#endif
#endif /* DISABLE_JAVA_NET */
#endif /* __JV_POSIX_H__ */
...@@ -22,6 +22,8 @@ details. */ ...@@ -22,6 +22,8 @@ details. */
#include <io.h> #include <io.h>
#ifndef DISBALE_JAVA_NET
// these errors cannot occur on Win32 // these errors cannot occur on Win32
#define ENOTCONN 0 #define ENOTCONN 0
#define ECONNRESET 0 #define ECONNRESET 0
...@@ -30,10 +32,14 @@ details. */ ...@@ -30,10 +32,14 @@ details. */
#define ENOPROTOOPT 109 #define ENOPROTOOPT 109
#endif #endif
#endif // DISBALE_JAVA_NET
extern void _Jv_platform_initialize (void); extern void _Jv_platform_initialize (void);
extern void _Jv_platform_initProperties (java::util::Properties*); extern void _Jv_platform_initProperties (java::util::Properties*);
extern jlong _Jv_platform_gettimeofday (); extern jlong _Jv_platform_gettimeofday ();
#ifndef DISBALE_JAVA_NET
static inline int static inline int
_Jv_socket (int domain, int type, int protocol) _Jv_socket (int domain, int type, int protocol)
{ {
...@@ -93,4 +99,6 @@ _Jv_read(int s, void *buf, int len) ...@@ -93,4 +99,6 @@ _Jv_read(int s, void *buf, int len)
ARRAY and return the exact number of values stored. */ ARRAY and return the exact number of values stored. */
extern int backtrace (void **__array, int __size); extern int backtrace (void **__array, int __size);
#endif /* DISBALE_JAVA_NET */
#endif /* __JV_WIN32_H__ */ #endif /* __JV_WIN32_H__ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment