diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-02-03 22:26:37 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-02-03 22:26:37 +0000 |
| commit | ec920869b6838ba18012f6547dba706f540f57ca (patch) | |
| tree | bcbdc8182bdc47aa5486a992bd09b45c1d0433c8 | |
| parent | 71888b01dec10fc9e5c072a38cbf9cfe5db2af2c (diff) | |
| download | ATCD-ec920869b6838ba18012f6547dba706f540f57ca.tar.gz | |
ChangeLogTag:Fri Feb 3 07:53:16 2006 Douglas C. Schmidt <schmidt@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ace/OS_NS_sys_socket.inl | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index c118503d8c8..5eef6a83675 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ Fri Feb 3 07:53:16 2006 Douglas C. Schmidt <schmidt@cs.wustl.edu> portable across versions of sockets! Thanks to David Hauck <davidh at netacquire dot com> for this fix. + * ace/OS_NS_sys_socket.inl (setsockopt): Only check for + WSAEOPNOTSUPP on platforms that actually support thi smacro! + Thanks to Wallace Zhang for reporting this. + 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 20ab16cd001..b7b3c8d3151 100644 --- a/ace/OS_NS_sys_socket.inl +++ b/ace/OS_NS_sys_socket.inl @@ -858,7 +858,11 @@ ACE_OS::setsockopt (ACE_HANDLE handle, int, -1, result); +#if defined (WSAEOPNOTSUPP) if (result == -1 && errno == WSAEOPNOTSUPP) +#else + if (result == -1) +#endif /* WSAEOPNOTSUPP */ errno = ENOTSUP; return result; } |