diff options
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/OS_NS_sys_stat.inl | 3 | ||||
| -rw-r--r-- | ACE/ace/SOCK_Dgram.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ACE/ace/OS_NS_sys_stat.inl b/ACE/ace/OS_NS_sys_stat.inl index ed4fa478181..ecfaf8b70e7 100644 --- a/ACE/ace/OS_NS_sys_stat.inl +++ b/ACE/ace/OS_NS_sys_stat.inl @@ -115,7 +115,8 @@ namespace ACE_OS # endif /* _FILE_OFFSET_BITS == 64 */ #else /* !ACE_WIN32 */ ACE_stat sb; - return ACE_OS::fstat (handle, &sb) == -1 ? -1 : sb.st_size; + return ACE_OS::fstat (handle, &sb) == -1 ? + static_cast<ACE_OFF_T> (-1) : sb.st_size; #endif } diff --git a/ACE/ace/SOCK_Dgram.cpp b/ACE/ace/SOCK_Dgram.cpp index 08c844cea08..6578e9a25d2 100644 --- a/ACE/ace/SOCK_Dgram.cpp +++ b/ACE/ace/SOCK_Dgram.cpp @@ -350,7 +350,7 @@ ACE_SOCK_Dgram::send (const iovec iov[], // Determine the total length of all the buffers in <iov>. for (i = 0; i < n; i++) -#if ! (defined(__BORLANDC__) || defined(linux) || defined(__RTEMS_MAJOR__)) +#if ! (defined(__BORLANDC__) || defined(linux) || defined(ACE_HAS_RTEMS)) // The iov_len is unsigned on Linux, RTEMS and with Borland. If we go // ahead and try the if, it will emit a warning. if (iov[i].iov_len < 0) @@ -399,7 +399,7 @@ ACE_SOCK_Dgram::recv (iovec iov[], int i; for (i = 0; i < n; i++) -#if ! (defined(__BORLANDC__) || defined(linux) || defined(__RTEMS_MAJOR__)) +#if ! (defined(__BORLANDC__) || defined(linux) || defined(ACE_HAS_RTEMS)) // The iov_len is unsigned on Linux, RTEMS and with Borland. If we go // ahead and try the if, it will emit a warning. if (iov[i].iov_len < 0) |