Commit bccf0bc8 authored by Pieter Hintjens's avatar Pieter Hintjens

Merge pull request #1326 from rodgert/master

resolve #1325 Alignment issue with zmq_msg_t on SPARC CPU
parents 96a27d11 d9fb1d36
...@@ -195,7 +195,10 @@ ZMQ_EXPORT int zmq_ctx_destroy (void *context); ...@@ -195,7 +195,10 @@ ZMQ_EXPORT int zmq_ctx_destroy (void *context);
/* 0MQ message definition. */ /* 0MQ message definition. */
/******************************************************************************/ /******************************************************************************/
typedef struct zmq_msg_t {unsigned char _ [64];} zmq_msg_t; /* union here ensures correct alignment on architectures that require it, e.g.
* SPARC
*/
typedef union zmq_msg_t {unsigned char _ [64]; void *p; } zmq_msg_t;
typedef void (zmq_free_fn) (void *data, void *hint); typedef void (zmq_free_fn) (void *data, void *hint);
......
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