diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-02-03 13:55:33 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-02-03 13:55:33 +0000 |
| commit | bf05c7b8a04c837cba1f506eeb728960ca0fbfe6 (patch) | |
| tree | 17f55774b3e7d5169014f547a57180a323106101 | |
| parent | ebf0ca2e490b2527457de42e501a4a010d3588e5 (diff) | |
| download | ATCD-bf05c7b8a04c837cba1f506eeb728960ca0fbfe6.tar.gz | |
ChangeLogTag:Fri Feb 3 07:53:16 2006 Douglas C. Schmidt <schmidt@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ace/OS_NS_sys_socket.inl | 19 |
2 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index ee5999c62a6..c118503d8c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Feb 3 07:53:16 2006 Douglas C. Schmidt <schmidt@cs.wustl.edu> + + * ace/OS_NS_sys_socket.inl (setsockopt): Make sure to + map WSAEOPNOTSUPP to the ENOTSUP errno value so the code is + portable across versions of sockets! Thanks to David Hauck + <davidh at netacquire dot com> for this fix. + Thu Feb 2 23:59:37 UTC 2006 William Otte <wotte@dre.vanderbilt.edu> * html/index.html diff --git a/ace/OS_NS_sys_socket.inl b/ace/OS_NS_sys_socket.inl index 71f3b2f3b28..20ab16cd001 100644 --- a/ace/OS_NS_sys_socket.inl +++ b/ace/OS_NS_sys_socket.inl @@ -849,13 +849,18 @@ ACE_OS::setsockopt (ACE_HANDLE handle, } #endif /*ACE_HAS_WINSOCK2*/ - ACE_SOCKCALL_RETURN (::setsockopt ((ACE_SOCKET) handle, - level, - optname, - (ACE_SOCKOPT_TYPE1) optval, - optlen), - int, - -1); + int result; + ACE_SOCKCALL (::setsockopt ((ACE_SOCKET) handle, + level, + optname, + (ACE_SOCKOPT_TYPE1) optval, + optlen), + int, + -1, + result); + if (result == -1 && errno == WSAEOPNOTSUPP) + errno = ENOTSUP; + return result; } ACE_INLINE int |