procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
* include/posix.h:
	(_Jv_platform_on_close): Moved out of #ifndef DISBALE_JAVA_NET.
	* include/win32.h:
	(_Jv_platform_on_close): Moved out of #ifndef DISBALE_JAVA_NET.
	(backtrace): Moved out of #ifndef DISBALE_JAVA_NET.

From-SVN: r59374
This commit is contained in:
Michael Koch 2002-11-22 10:27:53 +00:00 • committed by Michael Koch
parent fac3e63d64
commit c6d58c6682
3 changed files with 24 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libjava/ChangeLog
View file

@ -1,3 +1,11 @@
2002-11-22 Michael Koch <konqueror@gmx.de>
* include/posix.h:
(_Jv_platform_on_close): Moved out of #ifndef DISBALE_JAVA_NET.
* include/win32.h:
(_Jv_platform_on_close): Moved out of #ifndef DISBALE_JAVA_NET.
(backtrace): Moved out of #ifndef DISBALE_JAVA_NET.
2002-11-21 Michael Koch <konqueror@gmx.de>
* include/posix.h: I put too much into the #ifndef DISABLE_JAVA_NET.

14
libjava/include/posix.h
View file

@ -49,6 +49,13 @@ extern jlong _Jv_platform_gettimeofday ();
extern void _Jv_platform_initialize (void);
extern void _Jv_platform_initProperties (java::util::Properties*);
inline void
_Jv_platform_close_on_exec (jint fd)
{
// Ignore errors.
::fcntl (fd, F_SETFD, FD_CLOEXEC);
}
#ifndef DISABLE_JAVA_NET
static inline int
@ -69,13 +76,6 @@ _Jv_close (jint fd)
return ::close (fd);
}
inline void
_Jv_platform_close_on_exec (jint fd)
{
// Ignore errors.
::fcntl (fd, F_SETFD, FD_CLOEXEC);
}
// Avoid macro definitions of bind from system headers, e.g. on
// Solaris 7 with _XOPEN_SOURCE. FIXME
inline int

17
libjava/include/win32.h
View file

@ -38,6 +38,12 @@ extern void _Jv_platform_initialize (void);
extern void _Jv_platform_initProperties (java::util::Properties*);
extern jlong _Jv_platform_gettimeofday ();
inline void
_Jv_platform_close_on_exec (jint)
{
// Ignore.
}
#ifndef DISBALE_JAVA_NET
static inline int
@ -58,12 +64,6 @@ _Jv_close (jint fd)
return ::closesocket (fd);
}
inline void
_Jv_platform_close_on_exec (jint)
{
// Ignore.
}
inline int
_Jv_bind (int fd, struct sockaddr *addr, int addrlen)
{
@ -93,12 +93,13 @@ _Jv_read(int s, void *buf, int len)
{
return ::recv (s, (char*) buf, len, 0);
}
#endif /* DISBALE_JAVA_NET */
#define HAVE_BACKTRACE
/* Store up to SIZE return address of the current program state in
ARRAY and return the exact number of values stored. */
extern int backtrace (void **__array, int __size);
#endif /* DISBALE_JAVA_NET */
#endif /* __JV_WIN32_H__ */