2 files changed, 12 insertions, 2 deletions
diff --git a/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h b/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
index ce97f7bde8..eacdbc8446 100755
--- a/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/posix/IntegerTypes.h
@@ -21,6 +21,9 @@
  *
  */
 
+// Tell stdint we do want its macros!
+#define __STDC_LIMIT_MACROS
+#define __STDC_CONSTANT_MACROS
 #include <stdint.h>
 
 #endif  /*!QPID_SYS_INTEGERTYPES_H*/
diff --git a/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
index 28b82da1a0..df8a3c4731 100755
--- a/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
+++ b/qpid/cpp/include/qpid/sys/windows/IntegerTypes.h
@@ -21,15 +21,22 @@
  *
  */
 
+#if _MSC_VER < 1800
+#include <stdlib.h>
+#define strtoull _strtoui64
+#include <limits.h>
+#endif
+#if _MSC_VER < 1600
 typedef unsigned char    uint8_t;
+typedef signed char      int8_t;
 typedef unsigned short   uint16_t;
 typedef short            int16_t;
 typedef unsigned int     uint32_t;
 typedef int              int32_t;
-#if defined(_MSC_VER)
-typedef signed char      int8_t;
 typedef unsigned __int64 uint64_t;
 typedef          __int64 int64_t;
+#define INT64_MAX _I64_MAX
+#define INT64_MIN _I64_MIN
 #else
 #include <stdint.h>
 #endif