Skip to content

Commit d49bec4

Browse files
authored
Merge pull request #577 from herbrechtsmeier/posix
Detect POSIX compatiblity explicit
2 parents 99c4d37 + 9ed842c commit d49bec4

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

include/msgpack/sysdep.h

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
# endif
7575
# endif
7676

77-
#else /* _*/
77+
#elif defined(unix) || defined(__unix) || defined(__APPLE__)
7878

7979
#include <arpa/inet.h> /* __BYTE_ORDER */
8080
# if defined(linux)
@@ -85,34 +85,34 @@
8585

8686
#if MSGPACK_ENDIAN_LITTLE_BYTE
8787

88-
# ifdef _WIN32
89-
# if defined(ntohs)
88+
# if defined(unix) || defined(__unix) || defined(__APPLE__)
9089
# define _msgpack_be16(x) ntohs(x)
91-
# elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
92-
# define _msgpack_be16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
93-
# else
94-
# define _msgpack_be16(x) ( \
95-
((((uint16_t)x) << 8) ) | \
96-
((((uint16_t)x) >> 8) ) )
97-
# endif
9890
# else
99-
# define _msgpack_be16(x) ntohs(x)
91+
# if defined(ntohs)
92+
# define _msgpack_be16(x) ntohs(x)
93+
# elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
94+
# define _msgpack_be16(x) ((uint16_t)_byteswap_ushort((unsigned short)x))
95+
# else
96+
# define _msgpack_be16(x) ( \
97+
((((uint16_t)x) << 8) ) | \
98+
((((uint16_t)x) >> 8) ) )
99+
# endif
100100
# endif
101101

102-
# ifdef _WIN32
103-
# if defined(ntohl)
104-
# define _msgpack_be32(x) ntohl(x)
105-
# elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
106-
# define _msgpack_be32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
107-
# else
108-
# define _msgpack_be32(x) \
109-
( ((((uint32_t)x) << 24) ) | \
110-
((((uint32_t)x) << 8) & 0x00ff0000U ) | \
111-
((((uint32_t)x) >> 8) & 0x0000ff00U ) | \
112-
((((uint32_t)x) >> 24) ) )
113-
# endif
102+
# if defined(unix) || defined(__unix) || defined(__APPLE__)
103+
# define _msgpack_be32(x) ntohl(x)
114104
# else
115-
# define _msgpack_be32(x) ntohl(x)
105+
# if defined(ntohl)
106+
# define _msgpack_be32(x) ntohl(x)
107+
# elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
108+
# define _msgpack_be32(x) ((uint32_t)_byteswap_ulong((unsigned long)x))
109+
# else
110+
# define _msgpack_be32(x) \
111+
( ((((uint32_t)x) << 24) ) | \
112+
((((uint32_t)x) << 8) & 0x00ff0000U ) | \
113+
((((uint32_t)x) >> 8) & 0x0000ff00U ) | \
114+
((((uint32_t)x) >> 24) ) )
115+
# endif
116116
# endif
117117

118118
# if defined(_byteswap_uint64) || (defined(_MSC_VER) && _MSC_VER >= 1400)

include/msgpack/vrefbuffer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "zone.h"
1414
#include <stdlib.h>
1515

16-
#ifndef _WIN32
16+
#if defined(unix) || defined(__unix) || defined(__APPLE__)
1717
#include <sys/uio.h>
1818
#else
1919
struct iovec {

0 commit comments

Comments
 (0)