Merge branch 'master' into static-build

This commit is contained in:
Roman Isaikin committed 2016-04-09 22:37:40 +03:00
commit 49b6c10986
3 files changed
+6 -2

No files matched your search

+4
View File
@@ -19,6 +19,10 @@
#define MSGPACK_SYSDEP_H__
#include <qglobal.h>
#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER >= 1600
#include <stdint.h>
#endif
#ifndef _WIN32
#include <arpa/inet.h> /* __BYTE_ORDER */
#endif
+2 -1
View File
@@ -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 <QIODevice>
class MsgPackStream
class MSGPACK_EXPORT MsgPackStream
{
public:
MsgPackStream();