aboutsummaryrefslogtreecommitdiff
path: root/src/common/include.am
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-02-11 09:03:50 -0500
committerNick Mathewson <nickm@torproject.org>2015-02-11 09:03:50 -0500
commit6f331645c75e88ec4f6dbabce5a2d3733894dd78 (patch)
tree71c5a03b004043c2b5c41fa353392be1e913d075 /src/common/include.am
parent0c81dfa848da160b02818771626a425cd27b86bc (diff)
downloadtor-6f331645c75e88ec4f6dbabce5a2d3733894dd78.tar.gz
tor-6f331645c75e88ec4f6dbabce5a2d3733894dd78.zip
Remove mempools and buf freelists
They have been off-by-default since 0.2.5 and nobody has complained. :) Also remove the buf_shrink() function, which hasn't done anything since we first stopped using contiguous memory to store buffers. Closes ticket 14848.
Diffstat (limited to 'src/common/include.am')
-rw-r--r--src/common/include.am12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/common/include.am b/src/common/include.am
index 14838ab555..5b63392541 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -24,14 +24,6 @@ else
libor_extra_source=
endif
-if USE_MEMPOOLS
-libor_mempool_source=src/common/mempool.c
-libor_mempool_header=src/common/mempool.h
-else
-libor_mempool_source=
-libor_mempool_header=
-endif
-
src_common_libcurve25519_donna_a_CFLAGS=
if BUILD_CURVE25519_DONNA
@@ -78,7 +70,6 @@ LIBOR_A_SOURCES = \
src/ext/csiphash.c \
src/ext/trunnel/trunnel.c \
$(libor_extra_source) \
- $(libor_mempool_source) \
$(threads_impl_source)
LIBOR_CRYPTO_A_SOURCES = \
@@ -138,8 +129,7 @@ COMMONHEADERS = \
src/common/tortls.h \
src/common/util.h \
src/common/util_process.h \
- src/common/workqueue.h \
- $(libor_mempool_header)
+ src/common/workqueue.h
noinst_HEADERS+= $(COMMONHEADERS)