merged mingw fix from RC_0_16

This commit is contained in:
Arvid Norberg 2014-02-13 07:42:37 +00:00
parent e780f5240f
commit 68f2e3f1ff
2 changed files with 13 additions and 3 deletions

View File

@ -43,6 +43,7 @@
0.16.15 release
* fix mingw time_t 64 bit issue
* fix use of SetFileValidData on windows
* fix crash when using full allocation storage mode
* improve error_code and error_category support in python bindings

View File

@ -250,8 +250,8 @@ POSSIBILITY OF SUCH DAMAGE.
#define TORRENT_MINGW
#define TORRENT_WINDOWS
#ifndef TORRENT_USE_ICONV
#define TORRENT_USE_ICONV 0
#define TORRENT_USE_LOCALE 1
# define TORRENT_USE_ICONV 0
# define TORRENT_USE_LOCALE 1
#endif
#define TORRENT_USE_RLIMIT 0
#define TORRENT_USE_NETLINK 0
@ -259,7 +259,16 @@ POSSIBILITY OF SUCH DAMAGE.
#define TORRENT_HAS_SALEN 0
#define TORRENT_USE_GETIPFORWARDTABLE 1
#ifndef TORRENT_USE_UNC_PATHS
#define TORRENT_USE_UNC_PATHS 1
# define TORRENT_USE_UNC_PATHS 1
#endif
// this is necessary to enable 64-bit
// time_t, specifically used for the stat
// struct. Without this, modification times
// returned by stat may be incorrect and
// consistently fail resume data
#ifndef __MINGW_USE_VC2005_COMPAT
# define __MINGW_USE_VC2005_COMPAT
#endif
// ==== WINDOWS ===