diff options
Diffstat (limited to 'JavaScriptCore/wtf')
| -rw-r--r-- | JavaScriptCore/wtf/ThreadingPthreads.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/JavaScriptCore/wtf/ThreadingPthreads.cpp b/JavaScriptCore/wtf/ThreadingPthreads.cpp index 38faa61..6cad5e3 100644 --- a/JavaScriptCore/wtf/ThreadingPthreads.cpp +++ b/JavaScriptCore/wtf/ThreadingPthreads.cpp @@ -272,10 +272,6 @@ 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); |