remove left-over configuration options from aligned allocations
This commit is contained in:
parent
12cbcfd380
commit
a58307733e
4
Jamfile
4
Jamfile
|
@ -456,10 +456,6 @@ feature.compose <picker-debugging>on : <define>TORRENT_DEBUG_REFCOUNTS ;
|
||||||
feature simulator : off on : composite propagated link-incompatible ;
|
feature simulator : off on : composite propagated link-incompatible ;
|
||||||
feature.compose <simulator>on : <define>TORRENT_BUILD_SIMULATOR ;
|
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 invariant-checks : off on full : composite propagated link-incompatible ;
|
||||||
feature.compose <invariant-checks>on : <define>TORRENT_USE_INVARIANT_CHECKS=1 ;
|
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 ;
|
feature.compose <invariant-checks>full : <define>TORRENT_USE_INVARIANT_CHECKS=1 <define>TORRENT_EXPENSIVE_INVARIANT_CHECKS ;
|
||||||
|
|
|
@ -309,12 +309,6 @@ Build features:
|
||||||
| | * ``pre1.1`` - link against the old windows names |
|
| | * ``pre1.1`` - link against the old windows names |
|
||||||
| | (i.e. ``ssleay32`` and ``libeay32``. |
|
| | (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 |
|
| ``link`` | * ``static`` - builds libtorrent as a static |
|
||||||
| | library (.a / .lib) |
|
| | library (.a / .lib) |
|
||||||
| | * ``shared`` - builds libtorrent as a shared |
|
| | * ``shared`` - builds libtorrent as a shared |
|
||||||
|
|
|
@ -200,9 +200,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define TORRENT_ANDROID
|
#define TORRENT_ANDROID
|
||||||
#define TORRENT_HAS_FALLOCATE 0
|
#define TORRENT_HAS_FALLOCATE 0
|
||||||
#define TORRENT_USE_ICONV 0
|
#define TORRENT_USE_ICONV 0
|
||||||
#define TORRENT_USE_MEMALIGN 1
|
|
||||||
#else // ANDROID
|
#else // ANDROID
|
||||||
#define TORRENT_USE_POSIX_MEMALIGN 1
|
|
||||||
|
|
||||||
// posix_fallocate() is available under this condition
|
// posix_fallocate() is available under this condition
|
||||||
#if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L
|
#if _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L
|
||||||
|
@ -307,7 +305,6 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
#ifndef TORRENT_USE_ICONV
|
#ifndef TORRENT_USE_ICONV
|
||||||
#define TORRENT_USE_ICONV 0
|
#define TORRENT_USE_ICONV 0
|
||||||
#endif
|
#endif
|
||||||
#define TORRENT_USE_MEMALIGN 1
|
|
||||||
|
|
||||||
// ==== GNU/Hurd ===
|
// ==== GNU/Hurd ===
|
||||||
#elif defined __GNU__
|
#elif defined __GNU__
|
||||||
|
@ -386,14 +383,6 @@ POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define TORRENT_HAS_SEM_RELTIMEDWAIT 0
|
#define TORRENT_HAS_SEM_RELTIMEDWAIT 0
|
||||||
#endif
|
#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
|
#ifndef TORRENT_USE_LOCALE
|
||||||
#define TORRENT_USE_LOCALE 0
|
#define TORRENT_USE_LOCALE 0
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue