Merge branch 'master' into fix-monitor

This commit is contained in:
Lourens Naudé 2012-09-25 01:26:32 +01:00
commit b1776e234b

View File

@ -176,7 +176,7 @@ ZMQ_EXPORT int zmq_term (void *context);
/* 0MQ message definition. */
/******************************************************************************/
typedef struct {unsigned char _ [32];} zmq_msg_t;
typedef struct zmq_msg_t {unsigned char _ [32];} zmq_msg_t;
typedef void (zmq_free_fn) (void *data, void *hint);