OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Michael Koch 2002-11-21 14:34:12 +00:00 committed by Michael Koch
parent 7c143ed268
commit e59ff7e93a
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libjava/ChangeLog
View File

@ -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,

7
libjava/include/posix.h
View File

@ -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__ */

8
libjava/include/win32.h
View File

@ -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__ */