lock: remove deprecated module (#398)

baresip · Jun 12, 2022 · ab2870a · ab2870a
1 parent d8de40c
commit ab2870a
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 228 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -214,7 +214,6 @@ set(HEADERS
   include/re_jbuf.h
   include/re_json.h
   include/re_list.h
-  include/re_lock.h
   include/re_main.h
   include/re_mbuf.h
   include/re_md5.h
@@ -552,16 +551,6 @@ elseif(UNIX)
 endif()
 
 
-if(CMAKE_USE_WIN32_THREADS_INIT)
-  list(APPEND SRCS
-    src/lock/win32/lock.c
-  )
-else()
-  list(APPEND SRCS
-    src/lock/lock.c
-  )
-endif()
-
 if(HAVE_THREADS)
   #Do nothing
 elseif(CMAKE_USE_WIN32_THREADS_INIT)

diff --git a/Makefile b/Makefile
@@ -43,7 +43,7 @@ MODULES += dns
 MODULES += md5 crc32 sha hmac base64
 MODULES += udp sa net tcp tls
 MODULES += list mbuf hash
-MODULES += fmt tmr trace btrace main mem dbg sys thread lock mqueue
+MODULES += fmt tmr trace btrace main mem dbg sys thread mqueue
 MODULES += mod conf
 MODULES += bfcp
 MODULES += aes srtp

diff --git a/include/re.h b/include/re.h
@@ -34,7 +34,6 @@ extern "C" {
 #include "re_httpauth.h"
 #include "re_ice.h"
 #include "re_jbuf.h"
-#include "re_lock.h"
 #include "re_net.h"
 #include "re_main.h"
 #include "re_md5.h"

diff --git a/include/re_lock.h b/include/re_lock.h
diff --git a/src/lock/lock.c b/src/lock/lock.c
diff --git a/src/lock/mod.mk b/src/lock/mod.mk
diff --git a/src/lock/win32/lock.c b/src/lock/win32/lock.c
diff --git a/src/thread/posix.c b/src/thread/posix.c
@@ -6,7 +6,6 @@
 #define _GNU_SOURCE 1
 
 #include <re_types.h>
-#include <re_lock.h>
 #include <re_mem.h>
 #include <re_thread.h>
 

diff --git a/src/thread/win32.c b/src/thread/win32.c
@@ -6,7 +6,6 @@
 
 #include <process.h>
 #include <re_types.h>
-#include <re_lock.h>
 #include <re_mem.h>
 #include <re_thread.h>