diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-10-25 07:59:18 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-10-25 07:59:18 +0000 |
| commit | 83da94e1946ce133358d6132e229c44c862e5172 (patch) | |
| tree | 00c1c1eb89758c83f1e38d3f951337c4c72bb16f | |
| parent | acbf756aecc40a4c986f1ba6db9da8e937c2a23d (diff) | |
| download | ATCD-83da94e1946ce133358d6132e229c44c862e5172.tar.gz | |
Wed Oct 25 07:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/ace/INET_Addr.cpp | 2 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_sys_socket.inl | 32 | ||||
| -rw-r--r-- | ACE/ace/config-rtems.h | 4 |
4 files changed, 40 insertions, 5 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 5a26d3fbcd7..c2a1b66531b 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Wed Oct 25 07:58:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/config-rtems.h: + * ace/OS_NS_sys_socket.inl: + Added ACE_LACKS_ACCEPT, ACE_LACKS_CONNECT, ACE_LACKS_GETPEERNAME, + ACE_LACKS_GETSOCKNAME + Wed Oct 25 06:30:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * ace/TTY_IO.cpp: diff --git a/ACE/ace/INET_Addr.cpp b/ACE/ace/INET_Addr.cpp index 7ac62d73981..53c5aada3d5 100644 --- a/ACE/ace/INET_Addr.cpp +++ b/ACE/ace/INET_Addr.cpp @@ -741,6 +741,8 @@ ACE_INET_Addr::set_port_number (u_short port_number, #if !defined (ACE_LACKS_HTONS) if (encode) port_number = htons (port_number); +#else + ACE_UNUSED_ARG (encode); #endif /* ACE_LACKS_HTONS */ #if defined (ACE_HAS_IPV6) diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 49b3f940fc3..876781c30e0 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -41,7 +41,12 @@ ACE_OS::accept (ACE_HANDLE handle, // this function needs to be reviewed. On Win32, the regular macros // can be used, as this is not an issue. -#if defined (ACE_WIN32) +#if defined (ACE_LACKS_ACCEPT) + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (addr); + ACE_UNUSED_ARG (addrlen); + ACE_NOTSUP_RETURN (ACE_INVALID_HANDLE); +#elif defined (ACE_WIN32) ACE_SOCKCALL_RETURN (::accept ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN *) addrlen), @@ -127,9 +132,16 @@ ACE_OS::connect (ACE_HANDLE handle, int addrlen) { ACE_OS_TRACE ("ACE_OS::connect"); +#if defined (ACE_LACKS_CONNECT) + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (addr); + ACE_UNUSED_ARG (addrlen); + ACE_NOTSUP_RETURN (-1); +#else ACE_SOCKCALL_RETURN (::connect ((ACE_SOCKET) handle, addr, (ACE_SOCKET_LEN) addrlen), int, -1); +#endif /* ACE_LACKS_CONNECT */ } ACE_INLINE int @@ -159,8 +171,13 @@ ACE_OS::getpeername (ACE_HANDLE handle, struct sockaddr *addr, { ACE_OS_TRACE ("ACE_OS::getpeername"); -#if defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) \ - && (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO == 1) +#if defined (ACE_LACKS_GETPEERNAME) + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (addr); + ACE_UNUSED_ARG (addrlen); + ACE_NOTSUP_RETURN (-1); +#elif defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) \ + && (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO == 1) int result; ACE_SOCKCALL (::getpeername ((ACE_SOCKET) handle, addr, @@ -202,8 +219,13 @@ ACE_OS::getsockname (ACE_HANDLE handle, int *addrlen) { ACE_OS_TRACE ("ACE_OS::getsockname"); -#if defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) \ - && (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO == 1) +#if defined (ACE_LACKS_GETSOCKNAME) + ACE_UNUSED_ARG (handle); + ACE_UNUSED_ARG (addr); + ACE_UNUSED_ARG (addrlen); + ACE_NOTSUP_RETURN (-1); +#elif defined (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO) \ + && (ACE_GETNAME_RETURNS_RANDOM_SIN_ZERO == 1) int result; ACE_SOCKCALL (::getsockname ((ACE_SOCKET) handle, addr, diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h index e806539633d..a06e716533b 100644 --- a/ACE/ace/config-rtems.h +++ b/ACE/ace/config-rtems.h @@ -184,6 +184,10 @@ # define ACE_LACKS_INET_NTOA # define ACE_LACKS_GET_BCAST_ADDR # define ACE_LACKS_GETSERVBYNAME +# define ACE_LACKS_ACCEPT +# define ACE_LACKS_CONNECT +# define ACE_LACKS_GETPEERNAME +# define ACE_LACKS_GETSOCKNAME // Missing OS features # define ACE_LACKS_UNIX_SYSLOG |