diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-08-01 00:20:17 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2009-08-01 10:53:29 +0200 |
| commit | 078a2757847dcdd50a254d973d2c9a0556e98d75 (patch) | |
| tree | 47999cb47222e0e086df3d647ceaa85a0d0c8b86 /libs/utils | |
| parent | d3c6d54de9b9a599eb33f343fb1e0639fed02094 (diff) | |
| download | frameworks_base-078a2757847dcdd50a254d973d2c9a0556e98d75.zip frameworks_base-078a2757847dcdd50a254d973d2c9a0556e98d75.tar.gz frameworks_base-078a2757847dcdd50a254d973d2c9a0556e98d75.tar.bz2 | |
Fix Win32 libutils to get a working SDK build.
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/Threads.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/libs/utils/Threads.cpp b/libs/utils/Threads.cpp index 4036c49..6be372c 100644 --- a/libs/utils/Threads.cpp +++ b/libs/utils/Threads.cpp @@ -296,6 +296,19 @@ Mutex::Mutex(const char* name) // XXX: name not used for now HANDLE hMutex; + assert(sizeof(hMutex) == sizeof(mState)); + + hMutex = CreateMutex(NULL, FALSE, NULL); + mState = (void*) hMutex; +} + +Mutex::Mutex(int type, const char* name) +{ + // XXX: type and name not used for now + HANDLE hMutex; + + assert(sizeof(hMutex) == sizeof(mState)); + hMutex = CreateMutex(NULL, FALSE, NULL); mState = (void*) hMutex; } @@ -486,7 +499,11 @@ status_t Condition::wait(Mutex& mutex) status_t Condition::waitRelative(Mutex& mutex, nsecs_t reltime) { - return wait(mutex, systemTime()+reltime); + WinCondition* condState = (WinCondition*) mState; + HANDLE hMutex = (HANDLE) mutex.mState; + nsecs_t absTime = systemTime()+reltime; + + return ((WinCondition*)mState)->wait(condState, hMutex, &absTime); } /* |