Merge branch 'master' into static-build

This commit is contained in:
Roman Isaikin
2016-04-09 22:37:40 +03:00
3 changed files with 6 additions and 2 deletions

View File

@@ -1 +0,0 @@
IntxLNK/

View File

@@ -19,6 +19,10 @@
#define MSGPACK_SYSDEP_H__ #define MSGPACK_SYSDEP_H__
#include <qglobal.h> #include <qglobal.h>
#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER >= 1600
#include <stdint.h>
#endif
#ifndef _WIN32 #ifndef _WIN32
#include <arpa/inet.h> /* __BYTE_ORDER */ #include <arpa/inet.h> /* __BYTE_ORDER */
#endif #endif

View File

@@ -1,6 +1,7 @@
#ifndef STREAM_H #ifndef STREAM_H
#define STREAM_H #define STREAM_H
#include "msgpack_export.h"
#include "msgpackcommon.h" #include "msgpackcommon.h"
#include "endianhelper.h" #include "endianhelper.h"
@@ -8,7 +9,7 @@
#include <QIODevice> #include <QIODevice>
class MsgPackStream class MSGPACK_EXPORT MsgPackStream
{ {
public: public:
MsgPackStream(); MsgPackStream();