summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ace/OS.cpp6
-rw-r--r--ace/OS.i2
-rw-r--r--ace/Read_Buffer.cpp2
-rw-r--r--ace/Read_Buffer.h2
4 files changed, 7 insertions, 5 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp
index 2cbaf3bac79..3c0ae438f33 100644
--- a/ace/OS.cpp
+++ b/ace/OS.cpp
@@ -2152,9 +2152,11 @@ writev (ACE_HANDLE handle, ACE_WRITEV_TYPE iov[], int n)
// "Fake" readv for sites without it. Note that this is thread-safe.
extern "C" int
-readv (ACE_HANDLE handle, struct iovec *iov, int n)
+readv (ACE_HANDLE handle,
+ ACE_READV_TYPE *iov,
+ int n)
{
-// ACE_TRACE ("::readv");
+// ACE_TRACE ("readv");
ssize_t length = 0;
int i;
diff --git a/ace/OS.i b/ace/OS.i
index 7eb8d951d80..859a837a112 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -4713,7 +4713,7 @@ ACE_OS::writev (ACE_HANDLE handle,
ACE_INLINE ssize_t
ACE_OS::readv (ACE_HANDLE handle,
- ACE_READV_TYPE *iov,
+ struct iovec *iov,
int iovlen)
{
// ACE_TRACE ("ACE_OS::readv");
diff --git a/ace/Read_Buffer.cpp b/ace/Read_Buffer.cpp
index 10b38217357..3459cb660e1 100644
--- a/ace/Read_Buffer.cpp
+++ b/ace/Read_Buffer.cpp
@@ -29,7 +29,7 @@ ACE_Read_Buffer::ACE_Read_Buffer (FILE *fp,
this->allocator_ = ACE_Allocator::instance ();
}
-ACE_Read_Buffer::ACE_Read_Buffer (int handle,
+ACE_Read_Buffer::ACE_Read_Buffer (ACE_HANDLE handle,
int close_on_delete,
ACE_Allocator *alloc)
: stream_ (::fdopen (handle, "r")),
diff --git a/ace/Read_Buffer.h b/ace/Read_Buffer.h
index ff932925b60..49498d02ead 100644
--- a/ace/Read_Buffer.h
+++ b/ace/Read_Buffer.h
@@ -40,7 +40,7 @@ public:
ACE_Read_Buffer (FILE *fp, int close_on_delete = 0, ACE_Allocator * = 0);
// Read from a FILE *.
- ACE_Read_Buffer (int handle, int close_on_delete = 0, ACE_Allocator * = 0);
+ ACE_Read_Buffer (ACE_HANDLE handle, int close_on_delete = 0, ACE_Allocator * = 0);
// Read from an open HANDLE.
~ACE_Read_Buffer (void);