From 6cce06fbd646a214d30fe65f7d03ec8dff2f3620 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Thu, 3 Jul 2014 21:22:59 +0000
Subject: [PATCH] merged changes from RC_1_0

---
 include/libtorrent/config.hpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/include/libtorrent/config.hpp b/include/libtorrent/config.hpp
index d0e18bece..0b042be88 100644
--- a/include/libtorrent/config.hpp
+++ b/include/libtorrent/config.hpp
@@ -40,16 +40,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef __STDC_CONSTANT_MACROS
 #define __STDC_CONSTANT_MACROS 1
 #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
 
 #include <boost/config.hpp>
@@ -70,11 +60,21 @@ POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #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
 #define INT64_MAX 0x7fffffffffffffffLL
 #endif
+#if !defined INT16_MAX
+#define INT16_MAX 32767
+#endif
+#if !defined INT16_MIN
+#define INT16_MIN -32768
+#endif
+
 #endif
 
 #ifndef _MSC_VER