Skip to content

L
libzmq
Commit c993ac88 authored by Joe Eli McIlvain's avatar Joe Eli McIlvain
Browse files
Options

Merge pull request #1284 from hintjens/master 

Problem: incomplete definition of integer types
parents d2bacdf5 89a20417
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
include/zmq.h
View file @ c993ac88
...@@ -71,18 +71,18 @@ extern "C" { ...@@ -71,18 +71,18 @@ 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 #elif defined _MSC_VER
# ifndef int32_t typedef __int8 int8_t;
typedef __int16 int16_t;
typedef __int32 int32_t; typedef __int32 int32_t;
# endif typedef __int64 int64_t;
# ifndef uint16_t
typedef unsigned __int16 uint16_t;
# endif
# ifndef uint8_t
typedef unsigned __int8 uint8_t; typedef unsigned __int8 uint8_t;
# endif typedef unsigned __int16 uint16_t;
typedef unsigned __int32 uint32_t;
typedef unsigned __int64 uint64_t;
#else #else
# include <stdint.h> # include <stdint.h>
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment