From 527fb326769e40ab20b386c2b59454ba8413f8ee Mon Sep 17 00:00:00 2001 From: Hajime Yoshimori Date: Mon, 5 Oct 2015 10:42:03 +0900 Subject: [PATCH 1/3] Fix build under MSVC18.0 (2012) - stdint.h (which defines uint16_t and uint32_t) is bundled with the versions starting from MSVC14.0 (2010) --- src/endianhelper.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/endianhelper.h b/src/endianhelper.h index 25704f1..37139c6 100644 --- a/src/endianhelper.h +++ b/src/endianhelper.h @@ -19,6 +19,10 @@ #define MSGPACK_SYSDEP_H__ #include +#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER >= 1600 +#include +#endif + #ifndef _WIN32 #include /* __BYTE_ORDER */ #endif From 530ff27c0b811dfb85d3a5efa7f32151a59479b2 Mon Sep 17 00:00:00 2001 From: Hajime Yoshimori Date: Sat, 9 Jan 2016 21:15:37 +0900 Subject: [PATCH 2/3] Remove invalid symlink --- doc/_themes/sphinx_rtd_theme | Bin 118 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 120000 doc/_themes/sphinx_rtd_theme diff --git a/doc/_themes/sphinx_rtd_theme b/doc/_themes/sphinx_rtd_theme deleted file mode 120000 index 928fe94aa8b23509b63c527a965b85b86f69a828..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmeawE2;4D^Jdg%C}k*SC}PlO$YIE5NM=Z6$N{r68IlpS7 z7|a>;8B!QB8HyQ77<3s57!nzh8L}A?8PXY28HyS78HyPS7%~_#8S)q^7~&a<7)lsY P7~;Vuq%!0(q%r^ijy@Mo From 6e023af9e03842c93dd7b5bb1b31513fba6c6d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=98=D1=81=D0=B0=D0=B9?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD?= Date: Wed, 6 Apr 2016 11:33:23 +0300 Subject: [PATCH 3/3] Fix MsgPackStream export. --- src/msgpackstream.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/msgpackstream.h b/src/msgpackstream.h index 0e8aae7..37f7222 100644 --- a/src/msgpackstream.h +++ b/src/msgpackstream.h @@ -1,6 +1,7 @@ #ifndef STREAM_H #define STREAM_H +#include "msgpack_export.h" #include "msgpackcommon.h" #include "endianhelper.h" @@ -8,7 +9,7 @@ #include -class MsgPackStream +class MSGPACK_EXPORT MsgPackStream { public: MsgPackStream();