Skip to content

Commit

Permalink
resolve zeromq#1325 Alignment issue with zmq_msg_t on SPARC CPU
Browse files Browse the repository at this point in the history
should be backported probably
  • Loading branch information
Thomas Rodgers committed Jan 27, 2015
1 parent 96a27d1 commit d9fb1d3
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions include/zmq.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,10 @@ ZMQ_EXPORT int zmq_ctx_destroy (void *context);
/* 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);

Expand Down Expand Up @@ -286,7 +289,7 @@ ZMQ_EXPORT const char *zmq_msg_gets (zmq_msg_t *msg, const char *property);
#define ZMQ_ZAP_DOMAIN 55
#define ZMQ_ROUTER_HANDOVER 56
#define ZMQ_TOS 57
#define ZMQ_CONNECT_RID 61
#define ZMQ_CONNECT_RID 61
#define ZMQ_GSSAPI_SERVER 62
#define ZMQ_GSSAPI_PRINCIPAL 63
#define ZMQ_GSSAPI_SERVICE_PRINCIPAL 64
Expand Down

0 comments on commit d9fb1d3

Please sign in to comment.