ChangeLogTag: Mon Jun 14 13:58:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>

1 files changed, 23 insertions, 19 deletions

diff --git a/ace/SPIPE_Stream.i b/ace/SPIPE_Stream.i
index cb855663448..11b8fef5a9e 100644
--- a/ace/SPIPE_Stream.i
+++ b/ace/SPIPE_Stream.i
@@ -5,10 +5,14 @@
 
 #include "ace/OS_NS_sys_uio.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/OS_NS_unistd.h"
+#if defined (ACE_WIN32)
+#include "ace/OS_NS_sys_socket.h"
+#endif
 
 // Create an ACE_SPIPE_Stream.
 
-ASYS_INLINE int
+ACE_INLINE int
 ACE_SPIPE_Stream::get_remote_addr (ACE_SPIPE_Addr &remote_sap) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::get_remote_addr");
@@ -19,7 +23,7 @@ ACE_SPIPE_Stream::get_remote_addr (ACE_SPIPE_Addr &remote_sap) const
 // Send exactly N bytes from BUF to this socket.  Keeping trying until
 // this many bytes are sent.
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::send_n (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send_n");
@@ -29,63 +33,63 @@ ACE_SPIPE_Stream::send_n (const void *buf, size_t n) const
 // Receive exactly N bytes from this socket into BUF.  Keep trying
 // until this many bytes are received.
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::recv_n (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv_n");
   return ACE::read_n (this->get_handle (), buf, n);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::send (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send");
   return ACE_OS::write (this->get_handle (), (const char *) buf, n);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::recv (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv");
   return ACE_OS::read (this->get_handle (), (char *) buf, n);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int flags) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send");
   return ACE_OS::putmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *flags) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv");
   return ACE_OS::getmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, flags);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::send (const ACE_Str_Buf *cntl, const ACE_Str_Buf *data, int band, int flags) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send");
   return ACE_OS::putpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::recv (ACE_Str_Buf *cntl, ACE_Str_Buf *data, int *band, int *flags) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv");
   return ACE_OS::getpmsg (this->get_handle (), (strbuf *) cntl, (strbuf *) data, band, flags);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::send (const iovec iov[], int n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send");
   return ACE_OS::writev (this->get_handle (), iov, n);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::recv (iovec iov[], int n) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv");
@@ -94,7 +98,7 @@ ACE_SPIPE_Stream::recv (iovec iov[], int n) const
 
 // This routine sends an open file descriptor to this socket.
 
-ASYS_INLINE int
+ACE_INLINE int
 ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::send_handle");
@@ -142,7 +146,7 @@ ACE_SPIPE_Stream::send_handle (ACE_HANDLE handle) const
 
 // This file receives an open file descriptor from this socket.
 
-ASYS_INLINE int
+ACE_INLINE int
 ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv_handle");
@@ -200,7 +204,7 @@ ACE_SPIPE_Stream::recv_handle (ACE_HANDLE &handle) const
 // This file receives an open file descriptor from this socket and
 // also passes back the information about the address...
 
-ASYS_INLINE int
+ACE_INLINE int
 ACE_SPIPE_Stream::recv_handle (strrecvfd &recvfd) const
 {
   ACE_TRACE ("ACE_SPIPE_Stream::recv_handle");
@@ -212,7 +216,7 @@ ACE_SPIPE_Stream::recv_handle (strrecvfd &recvfd) const
 #endif /* ACE_HAS_STREAM_PIPES */
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::send (const void *buf, size_t n,
                         ACE_OVERLAPPED *overlapped) const
 {
@@ -222,7 +226,7 @@ ACE_SPIPE_Stream::send (const void *buf, size_t n,
                         overlapped);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::recv (void *buf, size_t n,
                         ACE_OVERLAPPED *overlapped) const
 {
@@ -232,7 +236,7 @@ ACE_SPIPE_Stream::recv (void *buf, size_t n,
                        overlapped);
 }
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::sendv_n (const iovec iov[],
                            int n) const
 {
@@ -244,7 +248,7 @@ ACE_SPIPE_Stream::sendv_n (const iovec iov[],
 
 // Recv an n byte message from the Stream.
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::recvv_n (iovec iov[],
                            int n) const
 {
@@ -258,7 +262,7 @@ ACE_SPIPE_Stream::recvv_n (iovec iov[],
 
 // Send an <iovec> of size <n> to the Stream.
 
-ASYS_INLINE ssize_t
+ACE_INLINE ssize_t
 ACE_SPIPE_Stream::sendv (const iovec iov[],
                          int n) const
 {