diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-12-08 14:58:43 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-12-08 14:58:43 -0500 |
| commit | 5ee0cccd49e57fad8c810e817d912d4a61dbc96c (patch) | |
| tree | 2aa4d71a332805bcb1bf7746887e7435ffdc51f4 /src/common/compat_threads.h | |
| parent | 44010c6fc11608b13924372a179825946672cb23 (diff) | |
| parent | 7ca5f4bf0365b853cdb0bab5cc9cb0ce6deaec26 (diff) | |
| download | tor-5ee0cccd49e57fad8c810e817d912d4a61dbc96c.tar.gz tor-5ee0cccd49e57fad8c810e817d912d4a61dbc96c.zip | |
Merge branch 'macro_free_v2_squashed'
Diffstat (limited to 'src/common/compat_threads.h')
| -rw-r--r-- | src/common/compat_threads.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/compat_threads.h b/src/common/compat_threads.h index ce86b15e9d..c93e601ec5 100644 --- a/src/common/compat_threads.h +++ b/src/common/compat_threads.h @@ -54,7 +54,8 @@ void tor_mutex_init(tor_mutex_t *m); void tor_mutex_init_nonrecursive(tor_mutex_t *m); void tor_mutex_acquire(tor_mutex_t *m); void tor_mutex_release(tor_mutex_t *m); -void tor_mutex_free(tor_mutex_t *m); +void tor_mutex_free_(tor_mutex_t *m); +#define tor_mutex_free(m) FREE_AND_NULL(tor_mutex_t, tor_mutex_free_, (m)) void tor_mutex_uninit(tor_mutex_t *m); unsigned long tor_get_thread_id(void); void tor_threads_init(void); @@ -81,7 +82,8 @@ typedef struct tor_cond_t { } tor_cond_t; tor_cond_t *tor_cond_new(void); -void tor_cond_free(tor_cond_t *cond); +void tor_cond_free_(tor_cond_t *cond); +#define tor_cond_free(c) FREE_AND_NULL(tor_cond_t, tor_cond_free_, (c)) int tor_cond_init(tor_cond_t *cond); void tor_cond_uninit(tor_cond_t *cond); int tor_cond_wait(tor_cond_t *cond, tor_mutex_t *mutex, |