diff options
| author | Steve Huston <shuston@riverace.com> | 2003-03-21 00:53:11 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2003-03-21 00:53:11 +0000 |
| commit | 81422f71c310719a29fb757989c847104c1f8a56 (patch) | |
| tree | fd694b90bfc394079a86a43d4f1c5ea1063ca29b | |
| parent | 81c4ceab9254238637d6ee3d7b5c3cc82db673e0 (diff) | |
| download | ATCD-81422f71c310719a29fb757989c847104c1f8a56.tar.gz | |
ChangeLogTag:Thu Mar 20 19:50:36 2003 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ace/OS.i | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index e587972bf04..c2292af0e82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Mar 20 19:50:36 2003 Steve Huston <shuston@riverace.com> + + * ace/OS.i (ACE_OS::recursive_mutex_cond_unlock): If on WinCE, don't + do the check for RecursionCount; WinCE's structure doesn't have that + member. Also see: + Sat Mar 15 10:55:01 2003 Douglas C. Schmidt + Thu Mar 20 17:51:39 2003 Steve Huston <shuston@riverace.com> * bin/MakeProjectCreator/templates/em3vcp.mpd: Only output a linker @@ -2628,7 +2628,10 @@ ACE_OS::recursive_mutex_cond_unlock (ACE_recursive_thread_mutex_t *m, // it. Remember how many times, and reacquire it that many more times when // the condition is signaled. state.relock_count_ = 0; - while (m->LockCount > 0 && m->RecursionCount > 1) + while (m->LockCount > 0 +# if !defined (ACE_HAS_WINCE) /* WinCE doesn't have RecursionCount */ + && m->RecursionCount > 1) +# endif { // This may fail if the current thread doesn't own the mutex. If it // does fail, it'll be on the first try, so don't worry about resetting |