diff options
Diffstat (limited to 'JavaScriptCore/wtf/ThreadingPthreads.cpp')
| -rw-r--r-- | JavaScriptCore/wtf/ThreadingPthreads.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/JavaScriptCore/wtf/ThreadingPthreads.cpp b/JavaScriptCore/wtf/ThreadingPthreads.cpp index abefb40..38faa61 100644 --- a/JavaScriptCore/wtf/ThreadingPthreads.cpp +++ b/JavaScriptCore/wtf/ThreadingPthreads.cpp @@ -272,7 +272,10 @@ void Mutex::unlock() } #if HAVE(PTHREAD_RWLOCK) +<<<<<<< HEAD:JavaScriptCore/wtf/ThreadingPthreads.cpp +======= +>>>>>>> webkit.org at r50258.:JavaScriptCore/wtf/ThreadingPthreads.cpp ReadWriteLock::ReadWriteLock() { pthread_rwlock_init(&m_readWriteLock, NULL); |