summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2006-10-25 08:28:33 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2006-10-25 08:28:33 +0000
commit0fef4e83c303176229c3e5f4d9f9bd111d3eba47 (patch)
tree1a1540034c5fb4ec5da0fd2eaf9eb397e814f0ea
parent4d9cb9fbeb2ebdd875f623a97c2dff115dc9d818 (diff)
downloadATCD-0fef4e83c303176229c3e5f4d9f9bd111d3eba47.tar.gz
-rw-r--r--ACE/ace/OS_NS_sys_socket.inl26
-rw-r--r--ACE/ace/config-rtems.h1
2 files changed, 18 insertions, 9 deletions
diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl
index 1ea502f240f..14afb257b77 100644
--- a/ACE/ace/OS_NS_sys_socket.inl
+++ b/ACE/ace/OS_NS_sys_socket.inl
@@ -353,14 +353,22 @@ ACE_OS::recvfrom (ACE_HANDLE handle,
int *addrlen)
{
ACE_OS_TRACE ("ACE_OS::recvfrom");
-#if defined (ACE_WIN32)
- int shortened_len = static_cast<int> (len);
- int result = ::recvfrom ((ACE_SOCKET) handle,
- buf,
- shortened_len,
- flags,
- addr,
- (ACE_SOCKET_LEN *) addrlen);
+#if defined (ACE_LACKS_RECVFROM)
+ ACE_UNUSED_ARG (handle);
+ ACE_UNUSED_ARG (buf);
+ ACE_UNUSED_ARG (len);
+ ACE_UNUSED_ARG (flags);
+ ACE_UNUSED_ARG (addr);
+ ACE_UNUSED_ARG (addrlen);
+ ACE_NOTSUP_RETURN (-1);
+#elif defined (ACE_WIN32)
+ int const shortened_len = static_cast<int> (len);
+ int const result = ::recvfrom ((ACE_SOCKET) handle,
+ buf,
+ shortened_len,
+ flags,
+ addr,
+ (ACE_SOCKET_LEN *) addrlen);
if (result == SOCKET_ERROR)
{
ACE_OS::set_errno_to_wsa_last_error ();
@@ -380,7 +388,7 @@ ACE_OS::recvfrom (ACE_HANDLE handle,
addr,
(ACE_SOCKET_LEN *) addrlen),
ssize_t, -1);
-#endif /* defined (ACE_WIN32) */
+#endif /* ACE_LACKS_RECVFROM */
}
ACE_INLINE ssize_t
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index 48a22b71c1f..3b8a8ea56d3 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -192,6 +192,7 @@
# define ACE_LACKS_RECV
# define ACE_LACKS_SEND
# define ACE_LACKS_SENDTO
+# define ACE_LACKS_RECVFROM
# undef ACE_HAS_MSG
// Missing OS features