diff options
author | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-25 01:00:22 +0000 |
---|---|---|
committer | brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-25 01:00:22 +0000 |
commit | 7d840f29fe6213802537624fd9ec593d341828fa (patch) | |
tree | c4adcd8d8708fe58d0455a4139297e3410fbd4a7 | |
parent | e97057f7f6b4e39c9414d8667c1c52fa4483bfe5 (diff) | |
download | ATCD-7d840f29fe6213802537624fd9ec593d341828fa.tar.gz |
ChangeLogTag:Fri Nov 24 16:58:42 2000 Darrell Brunsch <brunsch@uci.edu>
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 7 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 7 | ||||
-rw-r--r-- | ace/IPC_SAP.cpp | 4 |
4 files changed, 23 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index a3cba5e26ff..f94cca916d4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Nov 24 16:58:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/IPC_SAP.cpp: + + WSAEventSelect is not available on Windows CE, so the #ifdefs + were changed so it calls ioctl on Windows CE also. + Fri Nov 24 15:43:20 2000 Carlos O'Ryan <coryan@uci.edu> * docs/ACE-categories.html: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index a3cba5e26ff..f94cca916d4 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Fri Nov 24 16:58:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/IPC_SAP.cpp: + + WSAEventSelect is not available on Windows CE, so the #ifdefs + were changed so it calls ioctl on Windows CE also. + Fri Nov 24 15:43:20 2000 Carlos O'Ryan <coryan@uci.edu> * docs/ACE-categories.html: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index a3cba5e26ff..f94cca916d4 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Fri Nov 24 16:58:42 2000 Darrell Brunsch <brunsch@uci.edu> + + * ace/IPC_SAP.cpp: + + WSAEventSelect is not available on Windows CE, so the #ifdefs + were changed so it calls ioctl on Windows CE also. + Fri Nov 24 15:43:20 2000 Carlos O'Ryan <coryan@uci.edu> * docs/ACE-categories.html: diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp index bfa3b14d6e3..66c263f0bd9 100644 --- a/ace/IPC_SAP.cpp +++ b/ace/IPC_SAP.cpp @@ -124,9 +124,9 @@ ACE_IPC_SAP::disable (int value) const { u_long nonblock = 0; -#if defined (ACE_WIN32) +#if defined (ACE_WIN32) && !defined (ACE_HAS_WINCE) ::WSAEventSelect((SOCKET)this->handle_, 0, 0); -#endif /* ACE_WIN32 */ +#endif /* ACE_WIN32 && !ACE_HAS_WINCE */ return ACE_OS::ioctl (this->handle_, FIONBIO, &nonblock); |