| Index: webrtc/system_wrappers/source/condition_variable_event_win.cc
|
| diff --git a/webrtc/system_wrappers/source/condition_variable_event_win.cc b/webrtc/system_wrappers/source/condition_variable_event_win.cc
|
| index f61e085384ffa19f300d2a7c79b3f91adb6de2f4..535cbc5460f7c9eca49fe93df0d040ab86223be0 100644
|
| --- a/webrtc/system_wrappers/source/condition_variable_event_win.cc
|
| +++ b/webrtc/system_wrappers/source/condition_variable_event_win.cc
|
| @@ -118,11 +118,11 @@ ConditionVariableEventWin::~ConditionVariableEventWin() {
|
| DeleteCriticalSection(&num_waiters_crit_sect_);
|
| }
|
|
|
| -void ConditionVariableEventWin::SleepCS(CriticalSectionWrapper& crit_sect) {
|
| +void ConditionVariableEventWin::SleepCS(CRITICAL_SECTION* crit_sect) {
|
| SleepCS(crit_sect, INFINITE);
|
| }
|
|
|
| -bool ConditionVariableEventWin::SleepCS(CriticalSectionWrapper& crit_sect,
|
| +bool ConditionVariableEventWin::SleepCS(CRITICAL_SECTION* crit_sect,
|
| unsigned long max_time_in_ms) {
|
| EnterCriticalSection(&num_waiters_crit_sect_);
|
|
|
| @@ -134,7 +134,7 @@ bool ConditionVariableEventWin::SleepCS(CriticalSectionWrapper& crit_sect,
|
| ++(num_waiters_[eventID]);
|
| LeaveCriticalSection(&num_waiters_crit_sect_);
|
|
|
| - LeaveCriticalSection(&crit_sect.crit_);
|
| + LeaveCriticalSection(crit_sect);
|
| HANDLE events[2];
|
| events[0] = events_[WAKE];
|
| events[1] = events_[eventID];
|
| @@ -160,7 +160,7 @@ bool ConditionVariableEventWin::SleepCS(CriticalSectionWrapper& crit_sect,
|
| ResetEvent(events_[eventID]);
|
| }
|
|
|
| - EnterCriticalSection(&crit_sect.crit_);
|
| + EnterCriticalSection(crit_sect);
|
| return ret_val;
|
| }
|
|
|
|
|