From a58307733e55ec7e41adbb42f2baad2b6d305e65 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@libtorrent.org>
Date: Sat, 24 Nov 2018 12:08:55 +0100
Subject: [PATCH] remove left-over configuration options from aligned
 allocations

---
 Jamfile                       |  4 ----
 docs/building.rst             |  6 ------
 include/libtorrent/config.hpp | 11 -----------
 3 files changed, 21 deletions(-)

diff --git a/Jamfile b/Jamfile
index e28f05d06..05220c33b 100644
--- a/Jamfile
+++ b/Jamfile
@@ -456,10 +456,6 @@ feature.compose <picker-debugging>on : <define>TORRENT_DEBUG_REFCOUNTS ;
 feature simulator : off on : composite propagated link-incompatible ;
 feature.compose <simulator>on : <define>TORRENT_BUILD_SIMULATOR ;
 
-feature piece-allocator : valloc memalign posix_memalign : composite propagated ;
-feature.compose <piece-allocator>memalign : <define>TORRENT_USE_MEMALIGN=1 ;
-feature.compose <piece-allocator>posix_memalign : <define>TORRENT_USE_POSIX_MEMALIGN=1 ;
-
 feature invariant-checks : off on full : composite propagated link-incompatible ;
 feature.compose <invariant-checks>on : <define>TORRENT_USE_INVARIANT_CHECKS=1 ;
 feature.compose <invariant-checks>full : <define>TORRENT_USE_INVARIANT_CHECKS=1 <define>TORRENT_EXPENSIVE_INVARIANT_CHECKS ;
diff --git a/docs/building.rst b/docs/building.rst
index 3931b96b7..ea1a2ef25 100644
--- a/docs/building.rst
+++ b/docs/building.rst
@@ -309,12 +309,6 @@ Build features:
 |                          | * ``pre1.1`` - link against the old windows names  |
 |                          |   (i.e. ``ssleay32`` and ``libeay32``.             |
 +--------------------------+----------------------------------------------------+
-| ``piece-allocator``      | * ``valloc`` - default, uses ``valloc()`` or       |
-|                          |   ``_aligned_malloc()`` for disk cache blocks.     |
-|                          |   send buffers.                                    |
-|                          | * ``memalign`` - uses ``memalign()``.              |
-|                          | * ``posix_memalign`` - uses ``posix_memalign()``.  |
-+--------------------------+----------------------------------------------------+
 | ``link``                 | * ``static`` - builds libtorrent as a static       |
 |                          |   library (.a / .lib)                              |
 |                          | * ``shared`` - builds libtorrent as a shared       |
diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index 152b88ec3..f9d62997f 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -200,9 +200,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #define TORRENT_ANDROID
 #define TORRENT_HAS_FALLOCATE 0
 #define TORRENT_USE_ICONV 0
-#define TORRENT_USE_MEMALIGN 1
 #else // ANDROID
-#define TORRENT_USE_POSIX_MEMALIGN 1
 
 // posix_fallocate() is available under this condition
 #if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L
@@ -307,7 +305,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TORRENT_USE_ICONV
 #define TORRENT_USE_ICONV 0
 #endif
-#define TORRENT_USE_MEMALIGN 1
 
 // ==== GNU/Hurd ===
 #elif defined __GNU__
@@ -386,14 +383,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #define TORRENT_HAS_SEM_RELTIMEDWAIT 0
 #endif
 
-#ifndef TORRENT_USE_MEMALIGN
-#define TORRENT_USE_MEMALIGN 0
-#endif
-
-#ifndef TORRENT_USE_POSIX_MEMALIGN
-#define TORRENT_USE_POSIX_MEMALIGN 0
-#endif
-
 #ifndef TORRENT_USE_LOCALE
 #define TORRENT_USE_LOCALE 0
 #endif