Skip to content

Commit 16f5847

Browse files
authored
Merge pull request #2179 from bluca/alignment_windoz
Problem: MS VC++ build broken
2 parents ac14981 + 2484d1c commit 16f5847

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

include/zmq.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,10 @@ typedef struct zmq_msg_t {
238238
(defined (__SUNPRO_C) && __SUNPRO_C >= 0x590) || \
239239
(defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
240240
unsigned char _ [64] __attribute__ ((aligned (sizeof (void *))));
241-
#elif defined(_MSC_VER)
242-
__declspec (align (sizeof (void *))) unsigned char _ [64];
241+
#elif defined (_MSC_VER) && (defined (_M_X64) || defined (_M_ARM64))
242+
__declspec (align (8)) unsigned char _ [64];
243+
#elif defined (_MSC_VER) && (defined (_M_IX86) || defined (_M_ARM_ARMV7VE))
244+
__declspec (align (4)) unsigned char _ [64];
243245
#else
244246
unsigned char _ [64];
245247
#endif

0 commit comments

Comments
 (0)