Skip to content

L
libzmq
Commit 5b83fe77 authored by Ian Barber's avatar Ian Barber
Browse files
Options

Merge pull request #430 from ipechorin/master 

Update MSVC2008 project after recent changes; fix compilation errors
parents a49e392e 9b58372a
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 6 deletions
builds/msvc/libzmq/libzmq.vcproj
View file @ 5b83fe77
...@@ -267,10 +267,6 @@ ...@@ -267,10 +267,6 @@
RelativePath="..\..\..\src\decoder.cpp" RelativePath="..\..\..\src\decoder.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\device.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\devpoll.cpp" RelativePath="..\..\..\src\devpoll.cpp"
> >
...@@ -383,6 +379,10 @@ ...@@ -383,6 +379,10 @@
RelativePath="..\..\..\src\poller_base.cpp" RelativePath="..\..\..\src\poller_base.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\proxy.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\pub.cpp" RelativePath="..\..\..\src\pub.cpp"
> >
...@@ -439,6 +439,10 @@ ...@@ -439,6 +439,10 @@
RelativePath="..\..\..\src\sub.cpp" RelativePath="..\..\..\src\sub.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\tcp.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\tcp_address.cpp" RelativePath="..\..\..\src\tcp_address.cpp"
> >
...@@ -459,6 +463,14 @@ ...@@ -459,6 +463,14 @@
RelativePath="..\..\..\src\trie.cpp" RelativePath="..\..\..\src\trie.cpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\v1_decoder.cpp"
>
</File>
<File
RelativePath="..\..\..\src\v1_encoder.cpp"
>
</File>
<File <File
RelativePath="..\..\..\src\xpub.cpp" RelativePath="..\..\..\src\xpub.cpp"
> >
...@@ -657,6 +669,10 @@ ...@@ -657,6 +669,10 @@
RelativePath="..\..\..\src\poller_base.hpp" RelativePath="..\..\..\src\poller_base.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\proxy.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\pub.hpp" RelativePath="..\..\..\src\pub.hpp"
> >
...@@ -713,6 +729,10 @@ ...@@ -713,6 +729,10 @@
RelativePath="..\..\..\src\sub.hpp" RelativePath="..\..\..\src\sub.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\tcp.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\tcp_address.hpp" RelativePath="..\..\..\src\tcp_address.hpp"
> >
...@@ -733,6 +753,18 @@ ...@@ -733,6 +753,18 @@
RelativePath="..\..\..\src\trie.hpp" RelativePath="..\..\..\src\trie.hpp"
> >
</File> </File>
<File
RelativePath="..\..\..\src\v1_decoder.hpp"
>
</File>
<File
RelativePath="..\..\..\src\v1_encoder.hpp"
>
</File>
<File
RelativePath="..\..\..\src\v1_protocol.hpp"
>
</File>
<File <File
RelativePath="..\..\..\src\windows.hpp" RelativePath="..\..\..\src\windows.hpp"
> >
......
src/encoder.hpp
View file @ 5b83fe77
...@@ -22,6 +22,12 @@ ...@@ -22,6 +22,12 @@
#ifndef __ZMQ_ENCODER_HPP_INCLUDED__ #ifndef __ZMQ_ENCODER_HPP_INCLUDED__
#define __ZMQ_ENCODER_HPP_INCLUDED__ #define __ZMQ_ENCODER_HPP_INCLUDED__
#if defined(_MSC_VER)
#ifndef NOMINMAX
#define NOMINMAX
#endif
#endif
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
......
src/i_decoder.hpp
View file @ 5b83fe77
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __ZMQ_I_DECODER_HPP_INCLUDED__ #ifndef __ZMQ_I_DECODER_HPP_INCLUDED__
#define __ZMQ_I_DECODER_HPP_INCLUDED__ #define __ZMQ_I_DECODER_HPP_INCLUDED__
#include <stdint.h> #include "stdint.hpp"
namespace zmq namespace zmq
{ {
......
src/i_encoder.hpp
View file @ 5b83fe77
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#ifndef __ZMQ_I_ENCODER_HPP_INCLUDED__ #ifndef __ZMQ_I_ENCODER_HPP_INCLUDED__
#define __ZMQ_I_ENCODER_HPP_INCLUDED__ #define __ZMQ_I_ENCODER_HPP_INCLUDED__
#include <stdint.h> #include "stdint.hpp"
namespace zmq namespace zmq
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment