From 5218d2a8b186bcf28ffe0a61e321a29585683b45 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Sep 2010 15:56:22 -0400
Subject: [PATCH] Make defer-internal.h use lock macros, not direct cess to
 lock fns

---
 defer-internal.h | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/defer-internal.h b/defer-internal.h
index 67e4d2ac..8bfa8488 100644
--- 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
 }