Completely remove the (mostly-removed) obsolete thread functions.

diff --git a/evthread.c b/evthread.c
index e2a95b9d29bb6192e5524d63f972bea9fb23acdc..0868d941cea6e41c652852f30da378b075de8301 100644 (file)
--- a/evthread.c
+++ b/evthread.c
@@ -74,27 +74,6 @@ evthread_set_lock_callbacks(const struct evthread_lock_callbacks *cbs)
        }
 }
 
-static void
-api_error(void)
-{
-       event_errx(1, "evthread_set_locking_callback and "
-           "evthread_set_lock_create_callbacks are obsolete; use "
-           "evthread_set_lock_callbacks instead.");
-}
-
-void
-evthread_set_locking_callback(void (*locking_fn)(int mode, void *lock))
-{
-       api_error();
-}
-
-void
-evthread_set_lock_create_callbacks(void *(*alloc_fn)(void),
-    void (*free_fn)(void *))
-{
-       api_error();
-}
-
 struct debug_lock {
        unsigned locktype;
        unsigned long held_by;

diff --git a/include/event2/thread.h b/include/event2/thread.h
index 1a517d81624849070752eab6b511ec416750a6b7..5e299e655d26d1db17936d4441dc5d200f75577e 100644 (file)
--- a/include/event2/thread.h
+++ b/include/event2/thread.h
@@ -72,20 +72,6 @@ extern "C" {
 
 #ifndef _EVENT_DISABLE_THREAD_SUPPORT
 
-/**
-   @deprecated Use evthread_set_lock_callbacks instead.  This API will
-     go away before Libevent 2.0.x-stable.
-*/
-void evthread_set_lock_create_callbacks(
-    void *(*alloc_fn)(void), void (*free_fn)(void *));
-
-/**
-   @deprecated Use evthread_set_lock_callbacks instead.  This API will
-     go away before Libevent 2.0.x-stable.
- */
-void evthread_set_locking_callback(
-    void (*locking_fn)(int mode, void *lock));
-
 #define EVTHREAD_LOCK_API_VERSION 1
 
 /** A recursive lock is one that can be acquired multiple times at once by the