Skip to content

Commit 6b99a0c

Browse files
committed
Merge branch 'jasperla-openbsd'
2 parents f638e21 + 1a3fcc3 commit 6b99a0c

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

include/msgpack/sysdep.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
# endif
7878
# endif
7979

80-
#elif defined(unix) || defined(__unix) || defined(__APPLE__)
80+
#elif defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__)
8181

8282
#include <arpa/inet.h> /* __BYTE_ORDER */
8383
# if defined(linux)
@@ -88,7 +88,7 @@
8888

8989
#if MSGPACK_ENDIAN_LITTLE_BYTE
9090

91-
# if defined(unix) || defined(__unix) || defined(__APPLE__)
91+
# if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__)
9292
# define _msgpack_be16(x) ntohs(x)
9393
# else
9494
# if defined(ntohs)
@@ -102,7 +102,7 @@
102102
# endif
103103
# endif
104104

105-
# if defined(unix) || defined(__unix) || defined(__APPLE__)
105+
# if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__)
106106
# define _msgpack_be32(x) ntohl(x)
107107
# else
108108
# if defined(ntohl)

include/msgpack/v1/vrefbuffer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// MessagePack for C++ zero-copy buffer implementation
33
//
4-
// Copyright (C) 2008-2013 FURUHASHI Sadayuki and KONDO Takatoshi
4+
// Copyright (C) 2008-2017 FURUHASHI Sadayuki and KONDO Takatoshi
55
//
66
// Distributed under the Boost Software License, Version 1.0.
77
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -22,7 +22,7 @@
2222
#endif
2323
#endif // defined(_MSC_VER)
2424

25-
#ifndef _WIN32
25+
#if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__)
2626
#include <sys/uio.h>
2727
#else
2828
struct iovec {

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-
#if defined(unix) || defined(__unix) || defined(__APPLE__)
16+
#if defined(unix) || defined(__unix) || defined(__APPLE__) || defined(__OpenBSD__)
1717
#include <sys/uio.h>
1818
#else
1919
struct iovec {

0 commit comments

Comments
 (0)