From 5df78592dbf7fcb07a7745328ec560ead34bbe91 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Wed, 1 Feb 2012 06:24:30 +0000 Subject: [PATCH] fix some config defines --- include/libtorrent/config.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp index 29e5fc0e1..c76e90192 100644 --- a/include/libtorrent/config.hpp +++ b/include/libtorrent/config.hpp @@ -330,11 +330,13 @@ inline int snprintf(char* buf, int len, char const* fmt, ...) #define TORRENT_BROKEN_UNIONS 0 #endif +#ifndef TORRENT_USE_WSTRING #if defined UNICODE && !defined BOOST_NO_STD_WSTRING #define TORRENT_USE_WSTRING 1 #else #define TORRENT_USE_WSTRING 0 #endif // UNICODE +#endif // TORRENT_USE_WSTRING #ifndef TORRENT_HAS_FALLOCATE #define TORRENT_HAS_FALLOCATE 1 @@ -384,11 +386,13 @@ inline int snprintf(char* buf, int len, char const* fmt, ...) #define TORRENT_NO_FPU 0 #endif -#if !defined TORRENT_USE_IOSTREAM && !defined BOOST_NO_IOSTREAM +#ifndef TORRENT_USE_IOSTREAM +#ifndef BOOST_NO_IOSTREAM #define TORRENT_USE_IOSTREAM 1 #else #define TORRENT_USE_IOSTREAM 0 #endif +#endif #ifndef TORRENT_USE_I2P #define TORRENT_USE_I2P 1