summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.cpm>2012-02-22 08:00:51 +0100
committerMartin Sustrik <sustrik@250bpm.cpm>2012-02-22 08:00:51 +0100
commit0b883e1910e76b9ae0c1a433dcb68dbac7bc790a (patch)
treeec21faacc29211d3fc847ac006da44f753f62e3f
parentb3c9f38a99e2580b4862e34388e2590e08c14c52 (diff)
xszmq is compiled under MSVC
Signed-off-by: Martin Sustrik <sustrik@250bpm.cpm>
-rw-r--r--builds/msvc/libxs/libxs.vcxproj5
-rw-r--r--builds/msvc/libxs/libxs.vcxproj.filters11
-rw-r--r--include/xszmq.h9
3 files changed, 22 insertions, 3 deletions
diff --git a/builds/msvc/libxs/libxs.vcxproj b/builds/msvc/libxs/libxs.vcxproj
index aaf6d1d..c784e99 100644
--- a/builds/msvc/libxs/libxs.vcxproj
+++ b/builds/msvc/libxs/libxs.vcxproj
@@ -160,10 +160,13 @@
<ClCompile Include="..\..\..\src\xreq.cpp" />
<ClCompile Include="..\..\..\src\xsub.cpp" />
<ClCompile Include="..\..\..\src\xs.cpp" />
+ <ClCompile Include="..\..\..\src\xszmq.cpp" />
<ClCompile Include="..\..\..\src\xs_utils.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\include\xs.h" />
+ <ClInclude Include="..\..\..\include\xszmq.h" />
+ <ClInclude Include="..\..\..\include\xszmq_utils.h" />
<ClInclude Include="..\..\..\include\xs_utils.h" />
<ClInclude Include="..\..\..\include\zmq.h" />
<ClInclude Include="..\..\..\src\array.hpp" />
@@ -239,4 +242,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project> \ No newline at end of file
diff --git a/builds/msvc/libxs/libxs.vcxproj.filters b/builds/msvc/libxs/libxs.vcxproj.filters
index 0b0b87e..0e41b21 100644
--- a/builds/msvc/libxs/libxs.vcxproj.filters
+++ b/builds/msvc/libxs/libxs.vcxproj.filters
@@ -179,6 +179,9 @@
<ClCompile Include="..\..\..\src\io_thread.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\xszmq.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\include\xs.h">
@@ -397,5 +400,11 @@
<ClInclude Include="..\..\..\src\io_thread.hpp">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\include\xszmq.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\include\xszmq_utils.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
-</Project>
+</Project> \ No newline at end of file
diff --git a/include/xszmq.h b/include/xszmq.h
index eabf3c8..4463d9d 100644
--- a/include/xszmq.h
+++ b/include/xszmq.h
@@ -108,10 +108,18 @@ XSZMQ_EXPORT void zmq_version (int *major, int *minor, int *patch);
#endif
/* Native 0MQ error codes. */
+#ifndef EFSM
#define EFSM (ZMQ_HAUSNUMERO + 51)
+#endif
+#ifndef ENOCOMPATPROTO
#define ENOCOMPATPROTO (ZMQ_HAUSNUMERO + 52)
+#endif
+#ifndef ETERM
#define ETERM (ZMQ_HAUSNUMERO + 53)
+#endif
+#ifndef EMTHREAD
#define EMTHREAD (ZMQ_HAUSNUMERO + 54)
+#endif
#endif /* XS_BUILDING_LIBXSZMQ */
@@ -273,4 +281,3 @@ XSZMQ_EXPORT int zmq_device (int device, void * insocket, void* outsocket);
#endif
#endif
-