generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-13 18:55:10 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1326 from rodgert/master

Browse Source 
resolve #1325 Alignment issue with zmq_msg_t on SPARC CPU
This commit is contained in:
Pieter Hintjens 2015-01-27 16:39:02 +01:00
commit bccf0bc813
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/zmq.h
View File

@ -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);
@ -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