From bd49bba49e3a039c537d35cc3a8e55d429c11af5 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Dec 2007 23:06:51 +0000 Subject: r17091@catbus: nickm | 2007-12-11 18:05:55 -0500 Fix compilation when --disable-threads is passed in. svn:r12768 --- ChangeLog | 1 + src/common/compat.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 926095a99f..8c9a4141ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ Changes in version 0.2.0.13-alpha - 2007-12-?? - Fix a couple of hard-to-trigger autoconf problems that could result in really weird results on platforms whose sys/types.h files define nonstandard integer types. + - Fix compilation with --disable-threads set. o Minor features: - On USR1, when dmalloc is in use, log the top 10 memory diff --git a/src/common/compat.h b/src/common/compat.h index e775884430..68c65569e4 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -469,12 +469,14 @@ void tor_mutex_acquire(tor_mutex_t *m); void tor_mutex_release(tor_mutex_t *m); void tor_mutex_free(tor_mutex_t *m); unsigned long tor_get_thread_id(void); +void tor_threads_init(void); #else #define tor_mutex_new() ((tor_mutex_t*)tor_malloc(sizeof(int))) #define tor_mutex_acquire(m) STMT_NIL #define tor_mutex_release(m) STMT_NIL #define tor_mutex_free(m) STMT_BEGIN tor_free(m); STMT_END #define tor_get_thread_id() (1UL) +#define tor_threads_init() STMT_NIL #endif #ifdef TOR_IS_MULTITHREADED @@ -484,7 +486,6 @@ void tor_cond_free(tor_cond_t *cond); int tor_cond_wait(tor_cond_t *cond, tor_mutex_t *mutex); void tor_cond_signal_one(tor_cond_t *cond); void tor_cond_signal_all(tor_cond_t *cond); -void tor_threads_init(void); #endif /* Platform-specific helpers. */ -- cgit v1.2.3-54-g00ecf