win32.cc: (_Jv_pipe) Implemented.

	* win32.cc: (_Jv_pipe) Implemented.
	* gnu/java/nio/natPipeImpl.cc: (nativeInit) Use
	_Jv_pipe instead of ::pipe.
	* include/posix.h: (_Jv_pipe) New inline.
	* include/win32.h: (_Jv_pipe) New declaration.

From-SVN: r72616

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d751c102c114f03c39d270e9532a53265deded99..03d60bd49bf1c3b4aa37cf7e52e6a1d5df4b2837 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-17  Mohan Embar  <gnustuff@thisiscool.com>
+
+       * win32.cc (_Jv_pipe): Implemented.
+       * gnu/java/nio/natPipeImpl.cc (nativeInit): Use
+       _Jv_pipe instead of ::pipe.
+       * include/posix.h (_Jv_pipe): New inline.
+       * include/win32.h (_Jv_pipe): New declaration.
+       
 2003-10-17  Ralph Loader  <rcl@ihug.co.nz>
 
        * java/lang/StringBuffer.java (getChars): Fix array index checks.

diff --git a/libjava/gnu/java/nio/natPipeImpl.cc b/libjava/gnu/java/nio/natPipeImpl.cc
index 522c24cc807c50c2c4a8a739f314a47eb5fa4c8c..caae89cdd1ab7f706946e8b23a6843354babeffc 100644 (file)
--- a/libjava/gnu/java/nio/natPipeImpl.cc
+++ b/libjava/gnu/java/nio/natPipeImpl.cc
@@ -26,7 +26,7 @@ gnu::java::nio::PipeImpl::nativeInit (::java::nio::channels::spi::SelectorProvid
 {
   int filedes [2];
 
-  if (::pipe (filedes) < 0)
+  if (_Jv_pipe (filedes) < 0)
     throw new ::java::io::IOException (JvNewStringUTF (strerror (errno)));
 
   /* FIXME

diff --git a/libjava/include/posix.h b/libjava/include/posix.h
index 2c6054ec93ce068232a159eb438dc5fc3daf42a3..c8cd5e25e28dbc9184fc63025aabcf51f5772c0f 100644 (file)
--- a/libjava/include/posix.h
+++ b/libjava/include/posix.h
@@ -178,4 +178,11 @@ _Jv_read(int s, void *buf, int len)
 
 #endif /* DISABLE_JAVA_NET */
 
+// Wraps ::pipe
+static inline int
+_Jv_pipe (int filedes[2])
+{
+  return ::pipe (filedes);
+}
+
 #endif /* __JV_POSIX_H__ */

diff --git a/libjava/include/win32.h b/libjava/include/win32.h
index 6da0eafaa9a286de9925b7d99df4d3502bac3bde..e169adf9b284a0e145392363bbc525f36b696676 100644 (file)
--- a/libjava/include/win32.h
+++ b/libjava/include/win32.h
@@ -95,6 +95,7 @@ extern void _Jv_platform_initialize (void);
 extern void _Jv_platform_initProperties (java::util::Properties*);
 extern jlong _Jv_platform_gettimeofday ();
 extern int _Jv_select (int n, fd_set *, fd_set *, fd_set *, struct timeval *);
+extern int _Jv_pipe (int filedes[2]);
 
 inline void
 _Jv_platform_close_on_exec (jint)

diff --git a/libjava/win32.cc b/libjava/win32.cc
index abe768ae5bd25550b9944c2affe3a4c1a33bec13..e44b7b28729629456ac4dbc66280cc07e6934b89 100644 (file)
--- a/libjava/win32.cc
+++ b/libjava/win32.cc
@@ -12,6 +12,7 @@ details.  */
 #include <platform.h>
 #include <sys/timeb.h>
 #include <stdlib.h>
+#include <fcntl.h>
 
 #include <java/lang/ArithmeticException.h>
 #include <java/lang/UnsupportedOperationException.h>
@@ -342,3 +343,9 @@ _Jv_select (int n, fd_set *readfds, fd_set  *writefds,
     }
   return r;      
 }
+
+int
+_Jv_pipe (int filedes[2])
+{
+  return _pipe (filedes, 4096, _O_BINARY);
+}