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.

From-SVN: r59374

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index f000e1794f210d5b677cdf1432f5042efc47ad98..be3ade93bf57d30d89e37cef60910932a3841a3f 100644 (file)
--- 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 521b16fa553d7691ee032659934d0932d85d5499..447cadaf790dc0d44030bd60327fbbb6a22726df 100644 (file)
--- 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 a1a8fc159f8b38cf9574ef28f71e5b59ef471ebe..62bc0c33cbba396e9a92d03ca6dd742a667a7109 100644 (file)
--- 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__ */