Merge pull request #35 from hintjens/master

Problem: event interface isn't compatible with CZMQ 3.0
This commit is contained in:
Constantin Rack 2015-06-04 13:51:47 +02:00
commit 23f68d2b39

View File

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