diff options
| author | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-12 19:28:00 +0000 |
|---|---|---|
| committer | Adam Mitz <mitza-oci@users.noreply.github.com> | 2009-06-12 19:28:00 +0000 |
| commit | b1fd8fe4ba90c2b1d72b4f759c2aab3a3a2e86cc (patch) | |
| tree | d9d698204d32fdd7f7181719cafbefe8222e102a | |
| parent | c2af59fb3c4aaf170182312e68f1225bcdc58721 (diff) | |
| download | ATCD-b1fd8fe4ba90c2b1d72b4f759c2aab3a3a2e86cc.tar.gz | |
ChangeLogTag: Fri Jun 12 19:05:43 UTC 2009 Adam Mitz <mitza@ociweb.com>
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/ace/OS_NS_sys_socket.inl | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 04d5690fea0..418fcb08633 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Fri Jun 12 19:05:43 UTC 2009 Adam Mitz <mitza@ociweb.com> + + * ace/OS_NS_sys_socket.inl: + + Windows Mobile 6 can return WSAENOPROTOOPT instead of WSAEOPNOTSUPP + for setsockopt with an unsupported option. + Fri Jun 12 19:16:04 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> Rever the change below, Adam has a better fix @@ -61,8 +68,8 @@ Thu Jun 11 19:27:33 UTC 2009 Steven Stallion <stallions@ociweb.com> * PROBLEM-REPORT-FORM: - Added additional PRF question about build method (commit performed - on behalf of Chris Cleeland). + Added additional PRF question about build method (commit performed + on behalf of Chris Cleeland). Thu Jun 11 13:25:09 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> diff --git a/ACE/ace/OS_NS_sys_socket.inl b/ACE/ace/OS_NS_sys_socket.inl index 5fd3fb10447..6fa4c34e15b 100644 --- a/ACE/ace/OS_NS_sys_socket.inl +++ b/ACE/ace/OS_NS_sys_socket.inl @@ -875,7 +875,7 @@ ACE_OS::setsockopt (ACE_HANDLE handle, -1, result); #if defined (WSAEOPNOTSUPP) - if (result == -1 && errno == WSAEOPNOTSUPP) + if (result == -1 && (errno == WSAEOPNOTSUPP || errno == WSAENOPROTOOPT)) #else if (result == -1) #endif /* WSAEOPNOTSUPP */ |