3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #430 from ipechorin/master

Browse Source 
Update MSVC2008 project after recent changes; fix compilation errors
This commit is contained in:
Ian Barber 2012-09-26 12:27:43 -07:00
commit 5b83fe778c
4 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
builds/msvc/libzmq/libzmq.vcproj
View File

@ -267,10 +267,6 @@
RelativePath="..\..\..\src\decoder.cpp"
>
</File>
<File
RelativePath="..\..\..\src\device.cpp"
>
</File>
<File
RelativePath="..\..\..\src\devpoll.cpp"
>
@ -383,6 +379,10 @@
RelativePath="..\..\..\src\poller_base.cpp"
>
</File>
<File
RelativePath="..\..\..\src\proxy.cpp"
>
</File>
<File
RelativePath="..\..\..\src\pub.cpp"
>
@ -439,6 +439,10 @@
RelativePath="..\..\..\src\sub.cpp"
>
</File>
<File
RelativePath="..\..\..\src\tcp.cpp"
>
</File>
<File
RelativePath="..\..\..\src\tcp_address.cpp"
>
@ -459,6 +463,14 @@
RelativePath="..\..\..\src\trie.cpp"
>
</File>
<File
RelativePath="..\..\..\src\v1_decoder.cpp"
>
</File>
<File
RelativePath="..\..\..\src\v1_encoder.cpp"
>
</File>
<File
RelativePath="..\..\..\src\xpub.cpp"
>
@ -657,6 +669,10 @@
RelativePath="..\..\..\src\poller_base.hpp"
>
</File>
<File
RelativePath="..\..\..\src\proxy.hpp"
>
</File>
<File
RelativePath="..\..\..\src\pub.hpp"
>
@ -713,6 +729,10 @@
RelativePath="..\..\..\src\sub.hpp"
>
</File>
<File
RelativePath="..\..\..\src\tcp.hpp"
>
</File>
<File
RelativePath="..\..\..\src\tcp_address.hpp"
>
@ -733,6 +753,18 @@
RelativePath="..\..\..\src\trie.hpp"
>
</File>
<File
RelativePath="..\..\..\src\v1_decoder.hpp"
>
</File>
<File
RelativePath="..\..\..\src\v1_encoder.hpp"
>
</File>
<File
RelativePath="..\..\..\src\v1_protocol.hpp"
>
</File>
<File
RelativePath="..\..\..\src\windows.hpp"
>

6
src/encoder.hpp
View File

@ -22,6 +22,12 @@
#ifndef __ZMQ_ENCODER_HPP_INCLUDED__
#define __ZMQ_ENCODER_HPP_INCLUDED__
#if defined(_MSC_VER)
#ifndef NOMINMAX
#define NOMINMAX
#endif
#endif
#include <stddef.h>
#include <string.h>
#include <stdlib.h>

2
src/i_decoder.hpp
View File

@ -21,7 +21,7 @@
#ifndef __ZMQ_I_DECODER_HPP_INCLUDED__
#define __ZMQ_I_DECODER_HPP_INCLUDED__
#include <stdint.h>
#include "stdint.hpp"
namespace zmq
{

2
src/i_encoder.hpp
View File

@ -21,7 +21,7 @@
#ifndef __ZMQ_I_ENCODER_HPP_INCLUDED__
#define __ZMQ_I_ENCODER_HPP_INCLUDED__
#include <stdint.h>
#include "stdint.hpp"
namespace zmq
{