generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-04 12:17:39 +01:00
Code Issues Projects Releases Wiki Activity

Problem: MS VC++ build broken

Browse Source 
Solution: try to detect architecture if building with VC++ and
hardcode pointer size accordingly.
Expressions are not allowed inside declspec intrinsics, which
includes other intrinsics.
This commit is contained in:
Luca Boccassi
2016-10-28 16:31:48 +01:00
parent ac14981651
commit 2484d1c859
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/zmq.h
View File

@@ -238,8 +238,10 @@ typedef struct zmq_msg_t {
(defined (__SUNPRO_C) && __SUNPRO_C >= 0x590) || \ (defined (__SUNPRO_C) && __SUNPRO_C >= 0x590) || \
(defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x590) (defined (__SUNPRO_CC) && __SUNPRO_CC >= 0x590)
unsigned char _ [64] __attribute__ ((aligned (sizeof (void *)))); unsigned char _ [64] __attribute__ ((aligned (sizeof (void *))));
#elif defined(_MSC_VER) #elif defined (_MSC_VER) && (defined (_M_X64) || defined (_M_ARM64))
__declspec (align (sizeof (void *))) unsigned char _ [64]; __declspec (align (8)) unsigned char _ [64];
#elif defined (_MSC_VER) && (defined (_M_IX86) || defined (_M_ARM_ARMV7VE))
__declspec (align (4)) unsigned char _ [64];
#else #else
unsigned char _ [64]; unsigned char _ [64];
#endif #endif