Merge pull request #335 from jdc8/master

Fix for issue 355 and fix for compile error with Visual C++ 2008
This commit is contained in:
Pieter Hintjens 2012-05-06 03:07:35 -07:00
commit 5dc44a63d6
2 changed files with 16 additions and 10 deletions

View File

@ -42,6 +42,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="-DDLL_EXPORT -DFD_SETSIZE=1024 -D_CRT_SECURE_NO_WARNINGS"
Optimization="0"
PreprocessorDefinitions="NOMINMAX"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@ -258,10 +259,18 @@
RelativePath="..\..\..\src\ctx.cpp"
>
</File>
<File
RelativePath="..\..\..\src\dealer.cpp"
>
</File>
<File
RelativePath="..\..\..\src\decoder.cpp"
>
</File>
<File
RelativePath="..\..\..\src\device.cpp"
>
</File>
<File
RelativePath="..\..\..\src\devpoll.cpp"
>
@ -402,6 +411,10 @@
RelativePath="..\..\..\src\req.cpp"
>
</File>
<File
RelativePath="..\..\..\src\router.cpp"
>
</File>
<File
RelativePath="..\..\..\src\select.cpp"
>
@ -450,14 +463,6 @@
RelativePath="..\..\..\src\xpub.cpp"
>
</File>
<File
RelativePath="..\..\..\src\xrep.cpp"
>
</File>
<File
RelativePath="..\..\..\src\xreq.cpp"
>
</File>
<File
RelativePath="..\..\..\src\xsub.cpp"
>

View File

@ -106,7 +106,9 @@
<ClCompile Include="..\..\..\src\address.cpp" />
<ClCompile Include="..\..\..\src\clock.cpp" />
<ClCompile Include="..\..\..\src\ctx.cpp" />
<ClCompile Include="..\..\..\src\dealer.cpp" />
<ClCompile Include="..\..\..\src\decoder.cpp" />
<ClCompile Include="..\..\..\src\device.cpp" />
<ClCompile Include="..\..\..\src\devpoll.cpp" />
<ClCompile Include="..\..\..\src\dist.cpp" />
<ClCompile Include="..\..\..\src\encoder.cpp" />
@ -144,6 +146,7 @@
<ClCompile Include="..\..\..\src\reaper.cpp" />
<ClCompile Include="..\..\..\src\rep.cpp" />
<ClCompile Include="..\..\..\src\req.cpp" />
<ClCompile Include="..\..\..\src\router.cpp" />
<ClCompile Include="..\..\..\src\select.cpp" />
<ClCompile Include="..\..\..\src\session_base.cpp" />
<ClCompile Include="..\..\..\src\signaler.cpp" />
@ -156,8 +159,6 @@
<ClCompile Include="..\..\..\src\thread.cpp" />
<ClCompile Include="..\..\..\src\trie.cpp" />
<ClCompile Include="..\..\..\src\xpub.cpp" />
<ClCompile Include="..\..\..\src\xrep.cpp" />
<ClCompile Include="..\..\..\src\xreq.cpp" />
<ClCompile Include="..\..\..\src\xsub.cpp" />
<ClCompile Include="..\..\..\src\zmq.cpp" />
<ClCompile Include="..\..\..\src\zmq_utils.cpp" />