LibThreading: Fix building the library on macOS

cubiclove · Jul 5, 2021 · 01db520 · 01db520
1 parent 565796a
commit 01db520
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt
@@ -108,6 +108,8 @@ include_directories(../../Userland/)
 include_directories(../../Userland/Libraries/)
 include_directories(${CMAKE_BINARY_DIR})
 add_library(LagomCore ${LAGOM_CORE_SOURCES})
+find_package(Threads REQUIRED)
+target_link_libraries(LagomCore PRIVATE Threads::Threads)
 
 if (BUILD_LAGOM)
  add_library(Lagom $<TARGET_OBJECTS:LagomCore> ${LAGOM_MORE_SOURCES})

diff --git a/Userland/Libraries/LibThreading/Lock.h b/Userland/Libraries/LibThreading/Lock.h
@@ -14,14 +14,25 @@ namespace Threading {
 
 class Lock {
 public:
- Lock() { }
+ Lock() {
+#ifndef __serenity__
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_init(&attr);
+ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+ pthread_mutex_init(&m_mutex, &attr);
+#endif
+ }
  ~Lock() { }
 
  void lock();
  void unlock();
 
 private:
+#ifdef __serenity__
  pthread_mutex_t m_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+#else
+ pthread_mutex_t m_mutex;
+#endif
 };
 
 class Locker {