Merge pull request #1284 from hintjens/master

Problem: incomplete definition of integer types

include/zmq.h

@@ -71,18 +71,18 @@ extern "C" {
 #endif
 
 /*  Define integer types needed for event interface                          */
+#define ZMQ_DEFINED_STDINT 1
 #if defined ZMQ_HAVE_SOLARIS || defined ZMQ_HAVE_OPENVMS
 #   include <inttypes.h>
-#elif defined _MSC_VER && _MSC_VER < 1600
-#   ifndef int32_t
+#elif defined _MSC_VER
+typedef __int8 int8_t;
+typedef __int16 int16_t;
 typedef __int32 int32_t;
-#   endif
-#   ifndef uint16_t
-typedef unsigned __int16 uint16_t;
-#   endif
-#   ifndef uint8_t
+typedef __int64 int64_t;
 typedef unsigned __int8 uint8_t;
-#   endif
+typedef unsigned __int16 uint16_t;
+typedef unsigned __int32 uint32_t;
+typedef unsigned __int64 uint64_t;
 #else
 #   include <stdint.h>
 #endif