diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-09-22 21:30:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-01-14 10:41:53 -0500 |
| commit | c2f0d52b7fb937f3f66ef8b2b74b0fdf239b0e9b (patch) | |
| tree | c0deccd74112c5d135d018099f616842431e81ee /src/common/include.am | |
| parent | 518b0b3c5fefba2458181c7f733bc684e5466cf9 (diff) | |
| download | tor-c2f0d52b7fb937f3f66ef8b2b74b0fdf239b0e9b.tar.gz tor-c2f0d52b7fb937f3f66ef8b2b74b0fdf239b0e9b.zip | |
Split threading-related code out of compat.c
Also, re-enable the #if'd out condition-variable code.
Work queues are going to make us hack on all of this stuff a bit more
closely, so it might not be a terrible idea to make it easier to hack.
Diffstat (limited to 'src/common/include.am')
| -rw-r--r-- | src/common/include.am | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/common/include.am b/src/common/include.am index 6441596199..e4eeba6bbf 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -54,10 +54,18 @@ endif LIBDONNA += $(LIBED25519_REF10) +if THREADS_PTHREADS +threads_impl_source=src/common/compat_pthreads.c +endif +if THREADS_WIN32 +threads_impl_source=src/common/compat_winthreads.c +endif + LIBOR_A_SOURCES = \ src/common/address.c \ src/common/backtrace.c \ src/common/compat.c \ + src/common/compat_threads.c \ src/common/container.c \ src/common/di_ops.c \ src/common/log.c \ @@ -69,7 +77,8 @@ LIBOR_A_SOURCES = \ src/ext/csiphash.c \ src/ext/trunnel/trunnel.c \ $(libor_extra_source) \ - $(libor_mempool_source) + $(libor_mempool_source) \ + $(threads_impl_source) LIBOR_CRYPTO_A_SOURCES = \ src/common/aes.c \ @@ -102,7 +111,6 @@ src_common_libor_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_common_libor_crypto_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) - COMMONHEADERS = \ src/common/address.h \ src/common/backtrace.h \ @@ -110,6 +118,7 @@ COMMONHEADERS = \ src/common/ciphers.inc \ src/common/compat.h \ src/common/compat_libevent.h \ + src/common/compat_threads.h \ src/common/container.h \ src/common/crypto.h \ src/common/crypto_curve25519.h \ |