diff options
| author | Andrei Popescu <andreip@google.com> | 2009-08-14 15:52:56 +0100 |
|---|---|---|
| committer | Andrei Popescu <andreip@google.com> | 2009-08-14 15:52:56 +0100 |
| commit | fc3566dd8afb671f5f2629103dc98fc790e21a90 (patch) | |
| tree | bcdac8ba5c668bf70c901c756f02255c497b2276 /JavaScriptCore/wtf | |
| parent | a8dc31a536c500068911fc79adaf29f051beb34b (diff) | |
| download | external_webkit-fc3566dd8afb671f5f2629103dc98fc790e21a90.zip external_webkit-fc3566dd8afb671f5f2629103dc98fc790e21a90.tar.gz external_webkit-fc3566dd8afb671f5f2629103dc98fc790e21a90.tar.bz2 | |
Fix ReadWriteLock class problem. Will upstream this asap
Diffstat (limited to 'JavaScriptCore/wtf')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 3 | ||||
| -rw-r--r-- | JavaScriptCore/wtf/Threading.h | 6 | ||||
| -rw-r--r-- | JavaScriptCore/wtf/ThreadingPthreads.cpp | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 3a7e2a0..845684e 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -419,6 +419,7 @@ #endif #define HAVE_READLINE 1 #define HAVE_RUNLOOP_TIMER 1 +#define HAVE_PTHREAD_RWLOCK 1 #endif #if PLATFORM(CHROMIUM) && PLATFORM(DARWIN) @@ -464,7 +465,7 @@ #define HAVE_SIGNAL_H 1 #endif -#if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) +#if !PLATFORM(WIN_OS) && !PLATFORM(SOLARIS) && !PLATFORM(SYMBIAN) && !COMPILER(RVCT) && !PLATFORM(ANDROID) #define HAVE_TM_GMTOFF 1 #define HAVE_TM_ZONE 1 #define HAVE_TIMEGM 1 diff --git a/JavaScriptCore/wtf/Threading.h b/JavaScriptCore/wtf/Threading.h index f892dcd..bbfe8b5 100644 --- a/JavaScriptCore/wtf/Threading.h +++ b/JavaScriptCore/wtf/Threading.h @@ -130,10 +130,10 @@ void detachThread(ThreadIdentifier); #if USE(PTHREADS) typedef pthread_mutex_t PlatformMutex; -#if PLATFORM(ANDROID) -typedef void* PlatformReadWriteLock; -#else +#if HAVE(PTHREAD_RWLOCK) typedef pthread_rwlock_t PlatformReadWriteLock; +#else +typedef void* PlatformReadWriteLock; #endif typedef pthread_cond_t PlatformCondition; #elif PLATFORM(GTK) diff --git a/JavaScriptCore/wtf/ThreadingPthreads.cpp b/JavaScriptCore/wtf/ThreadingPthreads.cpp index a321b40..ea09a1f 100644 --- a/JavaScriptCore/wtf/ThreadingPthreads.cpp +++ b/JavaScriptCore/wtf/ThreadingPthreads.cpp @@ -268,6 +268,7 @@ void Mutex::unlock() ASSERT_UNUSED(result, !result); } +#if HAVE(PTHREAD_RWLOCK) ReadWriteLock::ReadWriteLock() { @@ -322,6 +323,7 @@ void ReadWriteLock::unlock() int result = pthread_rwlock_unlock(&m_readWriteLock); ASSERT_UNUSED(result, !result); } +#endif // HAVE(PTHREAD_RWLOCK) ThreadCondition::ThreadCondition() { |