diff options
| author | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-22 10:27:53 +0000 |
|---|---|---|
| committer | mkoch <mkoch@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-22 10:27:53 +0000 |
| commit | 7bfeb7c5295c908e97781b89f0d55862e3838fa8 (patch) | |
| tree | af2229acbaae8dad77062972ca44b14b3b678302 /libjava | |
| parent | b895064e4ddd53290437c54e7d2ce2c5ff0c8a74 (diff) | |
| download | ppe42-gcc-7bfeb7c5295c908e97781b89f0d55862e3838fa8.tar.gz ppe42-gcc-7bfeb7c5295c908e97781b89f0d55862e3838fa8.zip | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59374 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 8 | ||||
| -rw-r--r-- | libjava/include/posix.h | 14 | ||||
| -rw-r--r-- | libjava/include/win32.h | 17 |
3 files changed, 24 insertions, 15 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index f000e1794f2..be3ade93bf5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -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. diff --git a/libjava/include/posix.h b/libjava/include/posix.h index 521b16fa553..447cadaf790 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -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 diff --git a/libjava/include/win32.h b/libjava/include/win32.h index a1a8fc159f8..62bc0c33cbb 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -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__ */ |
