generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-18 19:48:46 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #577 from herbrechtsmeier/posix

Browse Source 
Detect POSIX compatiblity explicit
This commit is contained in:
Takatoshi Kondo
2017-03-25 18:10:01 +09:00
committed by GitHub
parent 99c4d37a39 9ed842c014
commit d49bec4e11
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/msgpack/sysdep.h
View File

@@ -74,7 +74,7 @@
# endif # endif
# endif # endif
#else /* _*/ #elif defined(unix) || defined(__unix) || defined(__APPLE__)
#include <arpa/inet.h> /* __BYTE_ORDER */ #include <arpa/inet.h> /* __BYTE_ORDER */
# if defined(linux) # if defined(linux)
@@ -85,7 +85,9 @@
#if MSGPACK_ENDIAN_LITTLE_BYTE #if MSGPACK_ENDIAN_LITTLE_BYTE
# ifdef _WIN32 # if defined(unix) || defined(__unix) || defined(__APPLE__)
# define _msgpack_be16(x) ntohs(x)
# else
# if defined(ntohs) # if defined(ntohs)
# define _msgpack_be16(x) ntohs(x) # define _msgpack_be16(x) ntohs(x)
# elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400) # elif defined(_byteswap_ushort) || (defined(_MSC_VER) && _MSC_VER >= 1400)
@@ -95,11 +97,11 @@
((((uint16_t)x) << 8) ) | \ ((((uint16_t)x) << 8) ) | \
((((uint16_t)x) >> 8) ) ) ((((uint16_t)x) >> 8) ) )
# endif # endif
# else
# define _msgpack_be16(x) ntohs(x)
# endif # endif
# ifdef _WIN32 # if defined(unix) || defined(__unix) || defined(__APPLE__)
# define _msgpack_be32(x) ntohl(x)
# else
# if defined(ntohl) # if defined(ntohl)
# define _msgpack_be32(x) ntohl(x) # define _msgpack_be32(x) ntohl(x)
# elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400) # elif defined(_byteswap_ulong) || (defined(_MSC_VER) && _MSC_VER >= 1400)
@@ -111,8 +113,6 @@
((((uint32_t)x) >> 8) & 0x0000ff00U ) | \ ((((uint32_t)x) >> 8) & 0x0000ff00U ) | \
((((uint32_t)x) >> 24) ) ) ((((uint32_t)x) >> 24) ) )
# endif # endif
# else
# define _msgpack_be32(x) ntohl(x)
# endif # endif
# if defined(_byteswap_uint64) || (defined(_MSC_VER) && _MSC_VER >= 1400) # if defined(_byteswap_uint64) || (defined(_MSC_VER) && _MSC_VER >= 1400)

2
include/msgpack/vrefbuffer.h
View File

@@ -13,7 +13,7 @@
#include "zone.h" #include "zone.h"
#include <stdlib.h> #include <stdlib.h>
#ifndef _WIN32 #if defined(unix) || defined(__unix) || defined(__APPLE__)
#include <sys/uio.h> #include <sys/uio.h>
#else #else
struct iovec { struct iovec {