Merge pull request #430 from ipechorin/master

Update MSVC2008 project after recent changes; fix compilation errors

builds/msvc/libzmq/libzmq.vcproj

@@ -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"
 				>

src/encoder.hpp

@@ -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>

src/i_decoder.hpp

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

src/i_encoder.hpp

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