diff options
| author | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-21 23:52:29 +0000 |
|---|---|---|
| committer | pradeep <pradeep@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-11-21 23:52:29 +0000 |
| commit | f6f89036e27ca0e9b394c254e2077315c9492181 (patch) | |
| tree | 0c87bfc753b35c0e0bd408ed3546abd99bc18df4 | |
| parent | f3f8dfe19483b48e82e3b671acb2655bdcb1cde8 (diff) | |
| download | ATCD-f6f89036e27ca0e9b394c254e2077315c9492181.tar.gz | |
Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | ace/IPC_SAP.cpp | 13 |
4 files changed, 32 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 1e7412adeab..8c1e8782bca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/IPC_SAP.cpp: + + Modified ACE_IPC_SAP::disable to call ::WSAEventSelect on Win32. + Thanks to Chris Uzdavinis <chris@atdesk.com> for contributing + these changes. + Tue Nov 21 11:00:14 2000 Darrell Brunsch <brunsch@uci.edu> * tests/run_test.lst: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 1e7412adeab..8c1e8782bca 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/IPC_SAP.cpp: + + Modified ACE_IPC_SAP::disable to call ::WSAEventSelect on Win32. + Thanks to Chris Uzdavinis <chris@atdesk.com> for contributing + these changes. + Tue Nov 21 11:00:14 2000 Darrell Brunsch <brunsch@uci.edu> * tests/run_test.lst: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 1e7412adeab..8c1e8782bca 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Tue Nov 21 17:42:36 2000 Pradeep Gore <pradeep@cs.wustl.edu> + + * ace/IPC_SAP.cpp: + + Modified ACE_IPC_SAP::disable to call ::WSAEventSelect on Win32. + Thanks to Chris Uzdavinis <chris@atdesk.com> for contributing + these changes. + Tue Nov 21 11:00:14 2000 Darrell Brunsch <brunsch@uci.edu> * tests/run_test.lst: diff --git a/ace/IPC_SAP.cpp b/ace/IPC_SAP.cpp index 5caccb2a86a..4cf143818a2 100644 --- a/ace/IPC_SAP.cpp +++ b/ace/IPC_SAP.cpp @@ -78,7 +78,7 @@ ACE_IPC_SAP::enable (int value) const #if defined (F_SETOWN) && defined (FASYNC) if (ACE_OS::fcntl (this->handle_, F_SETOWN, - ACE_IPC_SAP::pid_) == -1 + ACE_IPC_SAP::pid_) == -1 || ACE_Flag_Manip::set_flags (this->handle_, FASYNC) == -1) return -1; @@ -93,7 +93,7 @@ ACE_IPC_SAP::enable (int value) const if (ACE_OS::fcntl (this->handle_, F_SETFD, 1) == -1) - return -1; + return -1; break; #endif /* F_SETFD */ case ACE_NONBLOCK: @@ -114,7 +114,7 @@ int ACE_IPC_SAP::disable (int value) const { ACE_TRACE ("ACE_IPC_SAP::disable"); - + #if defined (ACE_WIN32) || defined (VXWORKS) switch (value) { @@ -123,6 +123,9 @@ ACE_IPC_SAP::disable (int value) const // blocking: (0) { u_long nonblock = 0; +#if defined (ACE_WIN32) + ::WSAEventSelect(this->handle_, 0, 0); +#endif /* ACE_WIN32 */ return ACE_OS::ioctl (this->handle_, FIONBIO, &nonblock); @@ -150,7 +153,7 @@ ACE_IPC_SAP::disable (int value) const #if defined (F_SETOWN) && defined (FASYNC) if (ACE_OS::fcntl (this->handle_, F_SETOWN, - 0) == -1 + 0) == -1 || ACE_Flag_Manip::clr_flags (this->handle_, FASYNC) == -1) return -1; @@ -165,7 +168,7 @@ ACE_IPC_SAP::disable (int value) const if (ACE_OS::fcntl (this->handle_, F_SETFD, 0) == -1) - return -1; + return -1; break; #endif /* F_SETFD */ case ACE_NONBLOCK: |