Make defer-internal.h use lock macros, not direct cess to lock fns

diff --git a/defer-internal.h b/defer-internal.h
index 67e4d2ac8299f91b2e8446f0118492e82492476f..8bfa848898954558cce5fbd3763e27f98d34a3f3 100644 (file)
--- a/defer-internal.h
+++ b/defer-internal.h
@@ -84,22 +84,10 @@ void event_deferred_cb_cancel(struct deferred_cb_queue *, struct deferred_cb *);
  */
 void event_deferred_cb_schedule(struct deferred_cb_queue *, struct deferred_cb *);
 
-#ifdef _EVENT_DISABLE_THREAD_SUPPORT
-#define LOCK_DEFERRED_QUEUE(q) (void)0
-#define UNLOCK_DEFERRED_QUEUE(q) (void)0
-#else
 #define LOCK_DEFERRED_QUEUE(q)                                         \
-       do {                                                            \
-               if ((q)->lock)                                          \
-                       _evthread_lock_fns.lock(0, (q)->lock);          \
-       } while (0)
-
+       EVLOCK_LOCK((q)->lock, 0)
 #define UNLOCK_DEFERRED_QUEUE(q)                                       \
-       do {                                                            \
-               if ((q)->lock)                                          \
-                       _evthread_lock_fns.unlock(0, (q)->lock);        \
-       } while (0)
-#endif
+       EVLOCK_UNLOCK((q)->lock, 0)
 
 #ifdef __cplusplus
 }