premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-07-03 21:22:59 +00:00
parent 53401b92cd
commit 6cce06fbd6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/libtorrent/config.hpp
View File

@ -40,16 +40,6 @@ POSSIBILITY OF SUCH DAMAGE.
#ifndef __STDC_CONSTANT_MACROS #ifndef __STDC_CONSTANT_MACROS
#define __STDC_CONSTANT_MACROS 1 #define __STDC_CONSTANT_MACROS 1
#endif #endif
#else
#if !defined INT64_MAX
#define INT64_MAX 0x7fffffffffffffffLL
#endif
#if !defined INT16_MAX
#define INT16_MAX 32767
#endif
#if !defined INT16_MIN
#define INT16_MIN -32768
#endif
#endif #endif
#include <boost/config.hpp> #include <boost/config.hpp>
@ -70,11 +60,21 @@ POSSIBILITY OF SUCH DAMAGE.
#endif #endif
#if !defined _MSC_VER || _MSC_VER >= 1600 #if !defined _MSC_VER || _MSC_VER >= 1600
#include <stdint.h> // for INT64_MAX
#else #include <stdint.h> // for INT64_MAX et.al.
#else
#if !defined INT64_MAX #if !defined INT64_MAX
#define INT64_MAX 0x7fffffffffffffffLL #define INT64_MAX 0x7fffffffffffffffLL
#endif #endif
#if !defined INT16_MAX
#define INT16_MAX 32767
#endif
#if !defined INT16_MIN
#define INT16_MIN -32768
#endif
#endif #endif
#ifndef _MSC_VER #ifndef _MSC_VER